From 4f1b048f19fea43411c81cce685e329ef8270865 Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Mon, 19 Mar 2007 13:48:31 +0000 Subject: [PATCH] Allow to bypass second loadThemeOptions() call --- include/functions_smarty.inc.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/functions_smarty.inc.php b/include/functions_smarty.inc.php index 2a2602a..7469c93 100644 --- a/include/functions_smarty.inc.php +++ b/include/functions_smarty.inc.php @@ -818,7 +818,10 @@ function serendipity_smarty_init($vars = array()) { // setup custom smarty variables, modifiers etc. to use in their templates. @include_once $serendipity['smarty']->config_dir . '/config.inc.php'; - if (is_array($template_config)) { + if (is_array($template_loaded_config)) { + $template_vars =& $template_loaded_config; + $serendipity['smarty']->assign_by_ref('template_option', $template_vars); + } elseif (is_array($template_config)) { $template_vars =& serendipity_loadThemeOptions($template_config); $serendipity['smarty']->assign_by_ref('template_option', $template_vars); } -- 2.39.5