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

next: PHP 8 compat fixes

Browse Source
This commit is contained in:
onli 2021-07-04 18:43:51 +02:00
parent eb38547a24
commit 07272ec3c6
5 changed files with 11 additions and 11 deletions

4
templates/next/commentform.tpl

@ -16,7 +16,7 @@
<label for="serendipity_commentform_email">{$CONST.EMAIL}{if $required_fields.email}*{/if}</label>
<input id="serendipity_commentform_email" type="email" name="serendipity[email]" value="{$commentform_email}"{if $required_fields.email} required{/if}>
</div>
{if $spice.inputtwitter}
{if isset($spice.inputtwitter) and $spice.inputtwitter}
<div id="serendipity_commentspice_twitter" class="form_field">
<label for="serendipity_commentform_twitter">{$spice.inputtwitterlabel}</label>
<input id="serendipity_commentform_twitter" name="serendipity[twitter]" type="text" value="{$spice.inputtwittervalue}">
@ -26,7 +26,7 @@
<label for="serendipity_commentform_url">{$CONST.HOMEPAGE}{if $required_fields.url}*{/if}</label>
<input id="serendipity_commentform_url" type="url" name="serendipity[url]" value="{$commentform_url}" placeholder="http://example.org" {if $required_fields.url} required{/if}>
</div>
{if $spice.inputarticle}
{if isset($spice.inputarticle) and $spice.inputarticle}
<div id="serendipity_commentspice_rss" class="form_select spicehidden">
<label for="serendipity_commentform_rss">{$spice.inputarticlelabel}</label>
<select id="serendipity_commentform_rss" class="commentspice_rss_input" name="serendipity[promorss]"></select>

8
templates/next/comments.tpl

@ -1,8 +1,8 @@
{foreach from=$comments item=comment name="comments"}
<article id="c{$comment.id}" class="comment {cycle values="odd,even"}{if $comment.depth > 8} commentlevel-9{else} commentlevel-{$comment.depth}{/if}">
<header class="clearfix">
<h4>{if $comment.url}<a href="{$comment.url}">{/if}{$comment.author|default:$CONST.ANONYMOUS}{if $comment.url}</a>{/if}{if $comment.spice_twitter_name and not $comment.spice_twitter_followme} (<a href="{$comment.spice_twitter_url}"{if $comment.spice_twitter_nofollow} rel="nofollow"{/if}>@{$comment.spice_twitter_name}</a>){/if} {$CONST.ON} <time datetime="{$comment.timestamp|serendipity_html5time}">{$comment.timestamp|formatTime:$template_option.date_format}</time>:</h4>
{if $comment.spice_twitter_name && $comment.spice_twitter_followme}
<h4>{if $comment.url}<a href="{$comment.url}">{/if}{$comment.author|default:$CONST.ANONYMOUS}{if $comment.url}</a>{/if}{if isset($comment.spice_twitter_name) and $comment.spice_twitter_name and not $comment.spice_twitter_followme} (<a href="{$comment.spice_twitter_url}"{if $comment.spice_twitter_nofollow} rel="nofollow"{/if}>@{$comment.spice_twitter_name}</a>){/if} {$CONST.ON} <time datetime="{$comment.timestamp|serendipity_html5time}">{$comment.timestamp|formatTime:$template_option.date_format}</time>:</h4>
{if isset($comment.spice_twitter_name) and $comment.spice_twitter_name && $comment.spice_twitter_followme}
<div class="twitter_follow">
{$comment.spice_twitter_followme}
</div>
@ -10,7 +10,7 @@
</header>
<div class="clearfix">
{if $comment.avatar}{$comment.avatar}{/if}
{if isset($comment.avatar) and $comment.avatar}{$comment.avatar}{/if}
{if $comment.body == 'COMMENT_DELETED'}
<p class="msg-warning"><span class="icon-attention-circled" aria-hidden="true"></span> {$CONST.COMMENT_IS_DELETED}</p>
{else}
@ -19,7 +19,7 @@
</div>
<footer>
{if $comment.spice_article_name}
{if isset($comment.spice_article_name) and $comment.spice_article_name}
<p>{$comment.spice_article_prefix}: <a{if $comment.spice_article_nofollow} rel="nofollow"{/if} href="{$comment.spice_article_url}">{$comment.spice_article_name}</a></p>
{/if}
<ul class="meta">

4
templates/next/config.inc.php

@ -98,9 +98,9 @@ $template_config = array(
$template_config_groups = NULL;
$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']) && $_SESSION['serendipityUseTemplate']) {
$template_loaded_config['use_corenav'] = false;
}

4
templates/next/entries.tpl

@ -111,8 +111,8 @@
<p class="msg-notice"><span class="icon-info-circled" aria-hidden="true"></span> {$CONST.NO_ENTRIES_TO_PRINT}</p>
{/if}
{/foreach}
{if not $is_preview}
{if $staticpage_pagetitle == ''}
{if not $is_preview and not $is_single_entry}
{if ! isset($staticpage_pagetitle) || $staticpage_pagetitle == ''}
<nav class="pagination clearfix">
{if $footer_info}<h3>{$footer_info}</h3>{/if}
{if $footer_prev_page||$footer_next_page}

2
templates/next/index.tpl

@ -7,7 +7,7 @@
<title>{$head_title|default:$blogTitle}{if $head_subtitle} | {$head_subtitle}{/if}</title>
<meta name="generator" content="Serendipity v.{$head_version}">
<meta name="viewport" content="width=device-width, initial-scale=1">
{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) and $staticpage_pagetitle != "") || (isset($robots_index) and $robots_index == 'index'))}
<meta name="robots" content="index,follow">
{else}
<meta name="robots" content="noindex,follow">