php/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Allow to bypass second loadThemeOptions() call

Browse Source
This commit is contained in:
Garvin Hicking
2007-03-19 13:48:31 +00:00
parent 00fdf89123
commit af5e52e55e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_smarty.inc.php
+4 -1
View File
@@ -818,7 +818,10 @@ function serendipity_smarty_init($vars = array()) {
// setup custom smarty variables, modifiers etc. to use in their templates. // setup custom smarty variables, modifiers etc. to use in their templates.
@include_once $serendipity['smarty']->config_dir . '/config.inc.php'; @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); $template_vars =& serendipity_loadThemeOptions($template_config);
$serendipity['smarty']->assign_by_ref('template_option', $template_vars); $serendipity['smarty']->assign_by_ref('template_option', $template_vars);
} }