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

Update include/admin/templates.inc.php

Browse Source 
to avoid displaying older template vars in case of a template change like from BP to some other Template, in case of:
- previouses config_groups in templates with a config file and 
- all other other core used vars in case of no config file
This may need further finetuning...
This commit is contained in:
Ian
2013-02-05 17:24:39 +01:00
parent ad3301e932
commit 1559472ca3
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/admin/templates.inc.php
View File

@@ -80,9 +80,26 @@ $data["cur_template"] = $serendipity['template'];
if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $serendipity['template'] . '/config.inc.php')) { if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $serendipity['template'] . '/config.inc.php')) {
serendipity_smarty_init(); serendipity_smarty_init();
$old_template_config_groups = $template_config_groups;
include_once $serendipity['serendipityPath'] . $serendipity['templatePath'] . $serendipity['template'] . '/config.inc.php'; include_once $serendipity['serendipityPath'] . $serendipity['templatePath'] . $serendipity['template'] . '/config.inc.php';
// in case of theme switch, check to unset config_group array
if ($serendipity['GET']['adminAction'] == 'install' && $serendipity['GET']['adminModule'] == 'templates') {
// array diff - but do not do this for bulletproof, as this is the only one which needs them in case of reloads (temporary)
if($old_template_config_groups === $template_config_groups && $serendipity['GET']['theme'] != 'bulletproof') {
$template_config_groups = NULL; // force destroy previouses config_group array!
}
}
unset($old_template_config_groups);
} else {
if ($serendipity['GET']['adminAction'] == 'install' && $serendipity['GET']['adminModule'] == 'templates') {
#include_once $serendipity['serendipityPath'] . $serendipity['templatePath'] . '/default/config_fallback.inc.php';
$template_config_groups = NULL;
$template_config = NULL;
$template_loaded_config = NULL;
}
} }
if (is_array($template_config)) { if (is_array($template_config)) {
serendipity_plugin_api::hook_event('backend_templates_configuration_top', $template_config); serendipity_plugin_api::hook_event('backend_templates_configuration_top', $template_config);
$data["has_config"] = true; $data["has_config"] = true;