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

Fix: Don't break backend theme box

Browse Source 
If the current theme was not the same as the backend theme, but the
backend theme was part of a recommended theme, then that backend theme
would get accidentally removed from the list of themes and thus nto set
as the current backend theme, breaking the themes menu
This commit is contained in:
onli
2016-04-20 20:47:57 +00:00
parent 59e569e59f
commit 32d0a6bf4f
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,17 +225,22 @@ foreach ($stack as $theme => $info) {
if ($info['recommended']) {
$data['recommended_templates'][$theme] = $data['templates'][$theme];
if ($serendipity['template'] != $theme) {
if ($theme != $serendipity['template'] && $theme != $serendipity['template_backend']) {
unset($data['templates'][$theme]);
}
}
}
$data['cur_tpl'] = $data['templates'][$data['cur_template']];
$data['cur_tpl_backend'] = $data['templates'][$data['cur_template_backend']];
$data['cur_tpl'] = $data['templates'][$serendipity['template']];
$data['cur_tpl_backend'] = $data['templates'][$serendipity['template_backend']];
unset($data['templates'][$data['cur_template']]);
unset($data['recommended_templates'][$data['cur_template']]);
unset($data['templates'][$serendipity['template']]);
if ($serendipity['template'] != $serendipity['template_backend'] && isset($data['recommended_templates'][$serendipity['template_backend']]) && isset($data['templates'][$serendipity['template_backend']])) {
// when we could not unset a template because it is a backend template, and when that template is also a recommended template, then it will now
// be in recommended and in the normal tmeplate list. We just detected that and have to remove it
unset($data['templates'][$serendipity['template_backend']]);
}
unset($data['recommended_templates'][$serendipity['template']]);
echo serendipity_smarty_show('admin/templates.inc.tpl', $data);