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

Issue #164 - addresses commit @917fb30

Browse Source
This commit is contained in:
garvinhicking
2014-05-28 11:38:59 +02:00
parent d1881e474f
commit 71e4a6c1a9
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,12 +282,6 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
/* get sidebar locations */
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)) {
$template_vars =& serendipity_loadThemeOptions($template_config);
}
@ -297,10 +291,6 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
'eventh_col' => 'eventh'
);
if ((! isset($template_vars['sidebars'])) && isset($sidebars)) {
$template_vars['sidebars'] = $sidebars;
}
if (isset($template_vars['sidebars'])) {
$sidebars = explode(',', $template_vars['sidebars']);
} elseif (isset($serendipity['sidebars'])) {