PHP 8 compat fixes for bartleby

This commit is contained in:
onli 2021-07-04 15:34:44 +02:00
parent 91c8ee2d8d
commit 01aa046fc4
2 changed files with 3 additions and 2 deletions

View File

@ -359,6 +359,7 @@ function serendipity_logout() {
* @return null
*/
function serendipity_session_destroy() {
echo "session destroy";
$no_smarty = $_SESSION['no_smarty'];
@session_destroy();
session_start();
@ -2149,7 +2150,7 @@ function &serendipity_loadThemeOptions(&$template_config, $okey = '', $bc_bool =
}
foreach($template_config AS $key => $item) {
if (!isset($template_vars[$item['var']])) {
if (isset($item['var']) && !isset($template_vars[$item['var']])) {
$template_vars[$item['var']] = $item['default'] ?? null;
}
}

View File

@ -24,7 +24,7 @@
{if isset($entry) and 'is_entry_owner'|array_key_exists:$entry and $entry.is_entry_owner}
| <a class="comment_source_ownerlink" href="{$comment.link_delete}" title="{$CONST.COMMENT_DELETE_CONFIRM|@sprintf:$comment.id:$comment.author}">{$CONST.DELETE}</a>
{/if}
{if $template_option.refcomments == true}
{if isset($template_option.refcomments) and $template_option.refcomments == true}
{if $comment.parent_id != '0'}
| <a class="reply_origin" href="#c{$comment.parent_id}" title="{$CONST.TWOK11_REPLYORIGIN}: {$CONST.COMMENT} #c{$comment.parent_id}">{$CONST.TWOK11_REPLYORIGIN}</a>
{/if}