diff --git a/templates/clean-blog/config.inc.php b/templates/clean-blog/config.inc.php index 691bc820..647dbb14 100644 --- a/templates/clean-blog/config.inc.php +++ b/templates/clean-blog/config.inc.php @@ -215,7 +215,7 @@ $template_config = array( // Collapse template options into groups. $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'] ?? null, true); serendipity_loadGlobalThemeOptions($template_config, $template_loaded_config, $template_global_config); $navlinks_collapse = array( 'use_corenav', 'amount'); diff --git a/templates/clean-blog/content.tpl b/templates/clean-blog/content.tpl index 46947f26..e48fea82 100644 --- a/templates/clean-blog/content.tpl +++ b/templates/clean-blog/content.tpl @@ -4,9 +4,9 @@

{$CONST.SEARCH}

{$content_message}
{elseif $searchresult_results}

{$CONST.SEARCH}

{$content_message}
-{elseif $subscribe_confirm_error} +{elseif isset($subscribe_confirm_error) && $subscribe_confirm_error}

{$CONST.ERROR}

{$content_message}
-{elseif $subscribe_confirm_success} +{elseif isset($subscribe_confirm_success) && $subscribe_confirm_success}

{$CONST.SUCCESS}

{$content_message}
{elseif $content_message}
{$content_message}
diff --git a/templates/clean-blog/entries.tpl b/templates/clean-blog/entries.tpl index 99f36689..c67f8182 100644 --- a/templates/clean-blog/entries.tpl +++ b/templates/clean-blog/entries.tpl @@ -5,7 +5,7 @@
{if !$is_single_entry and not $entry.is_extended and not $is_preview}

{$entry.title}

- {if $entry.properties.entry_subtitle} + {if isset($entry.properties.entry_subtitle) and $entry.properties.entry_subtitle}

{$entry.properties.entry_subtitle|escape}

{elseif $template_option.subtitle_use_entrybody==true && $template_option.entrybody_detailed_only == true}

{$entry.body|@strip_tags|@strip|@truncate:70:" ..."}

diff --git a/templates/clean-blog/index.tpl b/templates/clean-blog/index.tpl index a62eaaa7..10b3a7a6 100644 --- a/templates/clean-blog/index.tpl +++ b/templates/clean-blog/index.tpl @@ -8,7 +8,7 @@ {$head_title|default:$blogTitle}{if $head_subtitle} | {$head_subtitle}{/if} {* CANONICAL *} - {if ($view == "entry" || $view == "start" || $view == "feed" || $view == "plugin" || $staticpage_pagetitle != "" || $robots_index == 'index')} + {if ($view == "entry" || $view == "start" || $view == "feed" || $view == "plugin" || (isset($staticpage_pagetitle) && $staticpage_pagetitle != "") || $robots_index == 'index')} {else} @@ -48,13 +48,13 @@ {else} {/if} - {elseif $staticpage_pagetitle && !$plugin_contactform_name} + {elseif (isset($staticpage_pagetitle) && $staticpage_pagetitle) && ! (isset($plugin_contactform_name) && $plugin_contactform_name)} {if $staticpage_custom.staticpage_header_image} {else} {/if} - {elseif $plugin_contactform_name} + {elseif (isset($plugin_contactform_name) && $plugin_contactform_name)} {elseif $view=="archive"}