Bugfix to properly use $smarty->template_dir

diff --git a/include/functions_smarty.inc.php b/include/functions_smarty.inc.php
index e989cdacf150119630c265775255ea97cfe45645..34307dd773fc4f3c22a7317a22475027be8986b2 100644 (file)
--- a/include/functions_smarty.inc.php
+++ b/include/functions_smarty.inc.php
@@ -146,7 +146,7 @@ function serendipity_smarty_init() {
                $serendipity['serendipityPath'] . $serendipity['templatePath'] . 'default'
         );
         $serendipity['smarty']->compile_dir   = $serendipity['serendipityPath'] . PATH_SMARTY_COMPILE;
-        $serendipity['smarty']->config_dir    = &$serendipity['smarty']->template_dir;
+        $serendipity['smarty']->config_dir    = &$serendipity['smarty']->template_dir[0];
         $serendipity['smarty']->secure_dir    = array($serendipity['serendipityPath'] . $serendipity['templatePath']);
         $serendipity['smarty']->security_settings['MODIFIER_FUNCS']  = array('sprintf', 'sizeof', 'count', 'rand');
         $serendipity['smarty']->security_settings['ALLOW_CONSTANTS'] = true;
@@ -169,7 +169,7 @@ function serendipity_smarty_init() {
     }
 
     if (!isset($serendipity['smarty_raw_mode'])) {
-        if (file_exists($serendipity['smarty']->template_dir . '/layout.php') && $serendipity['template'] != 'default') {
+        if (file_exists($serendipity['smarty']->config_dir . '/layout.php') && $serendipity['template'] != 'default') {
             $serendipity['smarty_raw_mode'] = true;
         } else {
             $serendipity['smarty_raw_mode'] = false;

diff --git a/include/genpage.inc.php b/include/genpage.inc.php
index 2746b956dc6950d5b90d9383bd07b6e7d498c2df..a0a90df5803263c6646efe7520c34701065b75e4 100644 (file)
--- a/include/genpage.inc.php
+++ b/include/genpage.inc.php
@@ -11,7 +11,7 @@ serendipity_smarty_init();
 
 // For advanced usage, we allow template authors to create a file 'config.inc.php' where they can
 // setup custom smarty variables, modifiers etc. to use in their templates.
-@include_once $serendipity['smarty']->template_dir . '/config.inc.php';
+@include_once $serendipity['smarty']->config_dir . '/config.inc.php';
 
 $serendipity['smarty']->assign(
     array(