Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory
Commits
58785771
Commit
58785771
authored
6 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(core) Fix template file path detection
issue
#5951
parent
b906c01a
dev
6342-update-the-locales-for-1-5
6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen
6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account
6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock
6378-orcid-test-method-is-wrong-and-break-orcid-saving
core-php8
master
fusiondirectory-1.5
fusiondirectory-1.4
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/class_pluglist.inc
+2
-0
include/class_pluglist.inc
plugins/generic/welcome/main.inc
+1
-4
plugins/generic/welcome/main.inc
with
3 additions
and
4 deletions
+3
-4
include/class_pluglist.inc
+
2
−
0
View file @
58785771
...
...
@@ -549,6 +549,8 @@ class pluglist {
$plugin_dir
=
$plist
->
get_path
(
$index
);
$plugin
=
$plist
->
dirlist
[
$index
];
}
/* Used by get_template_path */
session
::
set
(
'plugin_dir'
,
$plugin_dir
);
try
{
if
(
$forceCleanup
)
{
...
...
This diff is collapsed.
Click to expand it.
plugins/generic/welcome/main.inc
+
1
−
4
View file @
58785771
...
...
@@ -2,7 +2,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
Copyright (C) 2011-201
6
FusionDirectory
Copyright (C) 2011-201
9
FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
...
...
@@ -20,7 +20,6 @@
*/
if
(
!
$cleanup
)
{
session
::
set
(
'plugin_dir'
,
dirname
(
__FILE__
));
$smarty
->
assign
(
'iconmenu'
,
$plist
->
show_iconmenu
());
$smarty
->
assign
(
'header'
,
print_header
(
'geticon.php?context=applications&icon=config-welcome&size=48'
,
sprintf
(
_
(
'Welcome %s!'
),
$ui
->
cn
)));
$smarty
->
assign
(
'year'
,
date
(
'Y'
));
...
...
@@ -28,5 +27,3 @@ if (!$cleanup) {
$display
=
$smarty
->
fetch
(
get_template_path
(
'welcome.tpl'
,
TRUE
));
}
?>
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets