From 9c9382e6949e1366c6adb502b7aacae2c11023f7 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Thu, 08 Sep 2011 09:42:04 -0400 Subject: [PATCH] Fixed: FS#1709 - Wrong message "Your hard-disk space is going full" in the "Monitor -> Show Disk Usage" --- interface/lib/classes/tpl_ini.inc.php | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/interface/lib/classes/tpl_ini.inc.php b/interface/lib/classes/tpl_ini.inc.php index bbe26ea..8388148 100644 --- a/interface/lib/classes/tpl_ini.inc.php +++ b/interface/lib/classes/tpl_ini.inc.php @@ -48,14 +48,14 @@ /** Returns $array of config vars for vlibTemplate */ public static function vlibTemplate() { - - global $conf; - $tpl_dir = $conf['rootpath'].'/web/themes/'.$_SESSION['s']['theme'].'/templates'; - + $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,8 +89,8 @@ /* the following are only used by the vlibTemplateCache class. */ - // TODO: triggers a notice as its not set - 'CACHE_DIRECTORY' => $conf['template']['cache_dir'], + // pedro notes:: triggers a notice as its not set - was $conf['template']['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