diff --git a/templates/skeleton/config.inc.php b/templates/skeleton/config.inc.php index cea692a9..148c38e1 100644 --- a/templates/skeleton/config.inc.php +++ b/templates/skeleton/config.inc.php @@ -59,9 +59,9 @@ $template_config = array( ); $template_global_config = array('navigation' => true); -$template_loaded_config = serendipity_loadThemeOptions($template_config, $serendipity['smarty_vars']['template_option'], true); +$template_loaded_config = serendipity_loadThemeOptions($template_config, $serendipity['smarty_vars']['template_option'] ?? '', true); serendipity_loadGlobalThemeOptions($template_config, $template_loaded_config, $template_global_config); -if ($_SESSION['serendipityUseTemplate']) { +if (isset($_SESSION['serendipityUseTemplate']) and $_SESSION['serendipityUseTemplate']) { $template_loaded_config['use_corenav'] = false; } \ No newline at end of file diff --git a/templates/skeleton/entries.tpl b/templates/skeleton/entries.tpl index dfb62f28..466a8cb7 100644 --- a/templates/skeleton/entries.tpl +++ b/templates/skeleton/entries.tpl @@ -111,8 +111,8 @@

{$CONST.NO_ENTRIES_TO_PRINT}

{/if} {/foreach} -{if not $is_preview} - {if $staticpage_pagetitle == ''} +{if not $is_preview and not $is_single_entry} + {if ! isset($staticpage_pagetitle) or $staticpage_pagetitle == ''}