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_ini.inc.php | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/interface/lib/classes/tpl_ini.inc.php b/interface/lib/classes/tpl_ini.inc.php
index 601c5c2..8388148 100644
--- a/interface/lib/classes/tpl_ini.inc.php
+++ b/interface/lib/classes/tpl_ini.inc.php
@@ -48,13 +48,14 @@
/** Returns $array of config vars for vlibTemplate */
public static function vlibTemplate()
{
-
- global $conf;
$tpl_dir = ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates';
+ $def_tpl_dir = ISPC_THEMES_PATH.'/default/templates';
return array(
- 'TEMPLATE_DIR' => $tpl_dir, // Default directory for your template files (full path)
+ 'INCLUDE_PATHS' => array($tpl_dir), // The path, searched BEVORE the template_dir is searched for the template-file
+
+ 'TEMPLATE_DIR' => $def_tpl_dir, // Default directory for your template files (full path)
// leave the '/' or '\' off the end of the directory.
'MAX_INCLUDES' => 10, // Drill depth for tmpl_include's
@@ -89,7 +90,7 @@
/* the following are only used by the vlibTemplateCache class. */
// pedro notes:: triggers a notice as its not set - was $conf['template']['cache_dir'],
- 'CACHE_DIRECTORY' => $conf['cache_dir'],
+ 'CACHE_DIRECTORY' => ISPC_CACHE_PATH,
// Directory where the cached filesystem
// will be set up (full path, and must be writable)
// '/' or '\' off the end of the directory.
--
Gitblit v1.9.1