Allow to bypass second loadThemeOptions() call

diff --git a/include/functions_smarty.inc.php b/include/functions_smarty.inc.php
index 2a2602a5d56fb1bda583ed57ebd37037bbc5777e..7469c93d9fb8b7c733cdfa843680b413c5ace18b 100644 (file)
--- 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);
         }