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

fix: restore template sidebar settings (#164)

Browse Source
This commit is contained in:
onli
2014-05-26 23:22:51 +02:00
parent 0e41248edd
commit 917fb303f2
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/admin/plugins.inc.php
View File

@ -282,6 +282,12 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
/* get sidebar locations */ /* get sidebar locations */
serendipity_smarty_init(); serendipity_smarty_init();
if (isset($template_config['sidebars'])) {
// we save the sidebars set by the template here, because serendipity_loadThemeOption
// will otherwise overwrite it, since the move to a separate backend
$sidebars = $template_config['sidebars'][0];
}
if (is_array($template_config)) { if (is_array($template_config)) {
$template_vars =& serendipity_loadThemeOptions($template_config); $template_vars =& serendipity_loadThemeOptions($template_config);
} }
@ -290,6 +296,11 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
'event_col' => 'event', 'event_col' => 'event',
'eventh_col' => 'eventh' 'eventh_col' => 'eventh'
); );
if ((! isset($template_vars['sidebars'])) && isset($sidebars)) {
$template_vars['sidebars'] = $sidebars;
}
if (isset($template_vars['sidebars'])) { if (isset($template_vars['sidebars'])) {
$sidebars = explode(',', $template_vars['sidebars']); $sidebars = explode(',', $template_vars['sidebars']);
} elseif (isset($serendipity['sidebars'])) { } elseif (isset($serendipity['sidebars'])) {