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

PHP 8 compat fixes for clean blog

Browse Source
This commit is contained in:
onli 2021-06-27 22:58:03 +02:00
parent aacf8e7f2f
commit 6e4d16d149
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/functions_entries.inc.php
View File

@ -1232,6 +1232,12 @@ function serendipity_printEntries($entries, $extended = 0, $preview = false, $sm
if (strlen($entry['extended'] ?? null)) {
$entry['has_extended'] = true;
} else {
$entry['has_extended'] = false;
}
if (! isset($entry['add_footer'])) {
$entry['add_footer'] = '';
}
if (isset($entry['exflag']) && $entry['exflag'] && ($extended || $preview)) {

4
templates/clean-blog/entries.tpl
View File

@ -151,8 +151,8 @@
<p class="alert alert-info"><span class="fa-stack"><i class="fa fa-circle-thin fa-stack-2x"></i><i class="fa fa-info fa-stack-1x"></i></span> {$CONST.NO_ENTRIES_TO_PRINT}</p>
{/if}
{/foreach}
{if $footer_info or $footer_prev_page or $footer_next_page}
{if $footer_info}
{if (isset($footer_info) and $footer_info) or isset($footer_prev_page) and footer_prev_page or isset($footer_next_page) and $footer_next_page}
{if isset($footer_info) and $footer_info}
<p class="summary serendipity_center">{$footer_info}</p>
{/if}
<nav role="navigation">

6
templates/clean-blog/index.tpl
View File

@ -8,7 +8,7 @@
<meta name="generator" content="Serendipity v.{$serendipityVersion}">
<title>{$head_title|default:$blogTitle}{if $head_subtitle} | {$head_subtitle}{/if}</title>
{* CANONICAL *}
{if ($view == "entry" || $view == "start" || $view == "feed" || $view == "plugin" || (isset($staticpage_pagetitle) && $staticpage_pagetitle != "") || $robots_index == 'index')}
{if ($view == "entry" || $view == "start" || $view == "feed" || $view == "plugin" || (isset($staticpage_pagetitle) && $staticpage_pagetitle != "") || isset($robots_index) and $robots_index == 'index')}
<meta name="robots" content="index,follow">
{else}
<meta name="robots" content="noindex,follow">
@ -43,7 +43,7 @@
{* HEADER IMAGE *}
{if $view=="entry"}
{if $entry.properties.entry_specific_header_image}
{if isset($entry.properties.entry_specific_header_image) and $entry.properties.entry_specific_header_image}
<style type="text/css">.intro-header {ldelim}background-image: url('{$entry.properties.entry_specific_header_image}');{rdelim}</style>
{else}
<style type="text/css">.intro-header {ldelim}background-image: url('{if $template_option.entry_default_header_image}{$template_option.entry_default_header_image}{else}{serendipity_getFile file="img/post-bg.jpg"}{/if}');{rdelim}</style>
@ -127,7 +127,7 @@
<hr class="small">
{if $head_subtitle}<span class="subheading">{$head_subtitle|@default:$blogDescription}</span>{else}{$blogDescription}{/if}
{else}
{if $entry.properties.entry_subtitle}<h2 class="subheading">{$entry.properties.entry_subtitle|escape}</h2>{/if}
{if isset($entry.properties.entry_subtitle) and $entry.properties.entry_subtitle}<h2 class="subheading">{$entry.properties.entry_subtitle|escape}</h2>{/if}
<p class="meta">{$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {$CONST.ON} <time datetime="{$entry.timestamp|@serendipity_html5time}">{$entry.timestamp|@formatTime:$template_option.date_format}</time>{if $template_option.show_comment_link == true}&nbsp;&nbsp;<a href="{$entry.link}#comments" title="{if $entry.comments == 0}{$CONST.NO_COMMENTS}{else}{$entry.comments} {$entry.label_comments}{/if}"><button class="btn btn-sm btn-default"><span class="badge">{$entry.comments}</span>&nbsp;<i class="fa fa-lg fa-comment-o"></i><span class="sr-only">{$entry.label_comments}</span></button></a>{/if}{if $entry.is_entry_owner and not $is_preview}&nbsp;&nbsp;<a href="{$entry.link_edit}" title="{$CONST.EDIT_ENTRY}"><button class="btn btn-sm btn-default"><i class="fa fa-lg fa-edit"></i><span class="sr-only">{$CONST.EDIT_ENTRY}</span></button></a>{/if}</p>
{/if}
</div>

2
templates/clean-blog/preview_iframe.tpl
View File

@ -42,7 +42,7 @@
{$preview}
{elseif $mode == 'save'}
{$updertHooks}
{if $res}
{if isset($res) && $res}
<div class="alert alert-danger"><span class="fa-stack" aria-hidden="true"><i class="fa fa-circle-thin fa-stack-2x"></i><i class="fa fa-exclamation fa-stack-1x"></i></span> {$CONST.ERROR}: <b>{$res}</b></div>
{else}
{if $lastSavedEntry}