From 58785771fa9687ce4c10371f12b1b46d230b40f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Wed, 30 Jan 2019 10:12:04 +0100
Subject: [PATCH] :ambulance: fix(core) Fix template file path detection
issue #5951
---
include/class_pluglist.inc | 2 ++
plugins/generic/welcome/main.inc | 5 +----
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 3986a8d41..a8514afe8 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -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) {
diff --git a/plugins/generic/welcome/main.inc b/plugins/generic/welcome/main.inc
index 23c07774c..8f2a83a71 100644
--- a/plugins/generic/welcome/main.inc
+++ b/plugins/generic/welcome/main.inc
@@ -2,7 +2,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011-2016 FusionDirectory
+ Copyright (C) 2011-2019 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));
}
-
-?>
--
GitLab