From 7990f8881b085279269d35cf9dd2787b88ae1c08 Mon Sep 17 00:00:00 2001 From: mcramer <m.cramer@pixcept.de> Date: Tue, 27 Nov 2012 14:47:43 -0500 Subject: [PATCH] Bugfix: _ispconfig_pw_crypted was ignored (stripped off in encoding method) --- interface/lib/classes/tpl.inc.php | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/interface/lib/classes/tpl.inc.php b/interface/lib/classes/tpl.inc.php index 3bd310f..72d0dfe 100644 --- a/interface/lib/classes/tpl.inc.php +++ b/interface/lib/classes/tpl.inc.php @@ -878,8 +878,15 @@ */ private function _fileSearch($file) { - $filename = basename($file); + + $filename = basename($file); $filepath = dirname($file); + + if(isset($_SESSION['s']['module']['name']) && isset($_SESSION['s']['theme'])) { + if(is_file(ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates/'.$_SESSION['s']['module']['name'].'/'.$filename)) { + return ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates/'.$_SESSION['s']['module']['name'].'/'.$filename; + } + } //* check fullpath first.. $fullpath = $filepath.'/'.$filename; -- Gitblit v1.9.1