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

php8 compat: Multiple fixes

Browse Source
This commit is contained in:
onli
2021-03-15 22:51:46 +01:00
parent e07d08e60d
commit d817c67682
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/functions_smarty.inc.php
View File

@ -78,7 +78,7 @@ function serendipity_smarty_html5time($timestamp) {
function &serendipity_smarty_fetch($block, $file, $echo = false, $force_frontend = false) {
global $serendipity;
$output = $serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath', $force_frontend), null, null, null, ($echo === true && $serendipity['smarty_raw_mode']));
$output = $serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath', $force_frontend), null, null, null, ($echo === true && ($serendipity['smarty_raw_mode'] ?? null)));
$serendipity['smarty']->assignByRef($block, $output);
@ -638,7 +638,7 @@ function serendipity_smarty_getFile($params, $smarty) {
trigger_error("Smarty Error: " . __FUNCTION__ .": missing 'file' parameter", E_USER_WARNING);
return;
}
return serendipity_getTemplateFile($params['file'], 'serendipityHTTPPath', $params['frontend']);
return serendipity_getTemplateFile($params['file'], 'serendipityHTTPPath', $params['frontend'] ?? false);
}
function serendipity_smarty_getConfigVar($params, $smarty) {
@ -755,7 +755,7 @@ function &serendipity_smarty_printComments($params, $smarty) {
$params['order'] = 'ASC';
}
$comments = serendipity_fetchComments($params['entry'], (int)$params['limit'], 'co.id ' . $params['order']);
$comments = serendipity_fetchComments($params['entry'], (int)($params['limit'] ?? null), 'co.id ' . ($params['order'] ?? null));
if (!empty($serendipity['POST']['preview'])) {
$comments[] =
@ -904,7 +904,7 @@ function serendipity_smarty_init($vars = array()) {
}
// Set a session variable if Smarty fails:
$prev_smarty = $_SESSION['no_smarty'];
$prev_smarty = $_SESSION['no_smarty'] ?? null;
$_SESSION['no_smarty'] = true;
if (LANG_CHARSET != 'UTF-8') {
@ -1037,7 +1037,7 @@ function serendipity_smarty_init($vars = array()) {
$wysiwyg_customPlugin = $wysiwyg_customConfig = null;
if (defined('IN_serendipity_admin') && $serendipity['wysiwyg']) {
if (defined('IN_serendipity_admin') && array_key_exists('wysiwyg', $serendipity) && $serendipity['wysiwyg']) {
// check force internal toolbar config file
if (strpos($serendipity['wysiwygToolbar'], 'NOCC-') !== false) {
@ -1054,7 +1054,11 @@ function serendipity_smarty_init($vars = array()) {
}
$_force_backendpopups = explode(',', $serendipity['enableBackendPopupGranular']);
if (array_key_exists('enableBackendPopupGranular', $serendipity)) {
$_force_backendpopups = explode(',', $serendipity['enableBackendPopupGranular']);
} else {
$_force_backendpopups = [];
}
$force_backendpopups = array();
foreach($_force_backendpopups AS $fbp_key => $fbp_val) {
$fbp_val = trim($fbp_val);
@ -1066,18 +1070,18 @@ function serendipity_smarty_init($vars = array()) {
array(
'head_charset' => LANG_CHARSET,
'head_version' => $serendipity['version'],
'head_title' => $serendipity['head_title'],
'head_subtitle' => $serendipity['head_subtitle'],
'head_title' => $serendipity['head_title'] ?? null,
'head_subtitle' => $serendipity['head_subtitle'] ?? null,
'head_link_stylesheet' => $serendipity['smarty_vars']['head_link_stylesheet'],
'head_link_script' => $serendipity['smarty_vars']['head_link_script'],
'head_link_stylesheet_frontend' => $serendipity['smarty_vars']['head_link_stylesheet_frontend'],
'is_xhtml' => true,
'use_popups' => $serendipity['enablePopup'],
'use_backendpopups' => $serendipity['enableBackendPopup'],
'use_popups' => $serendipity['enablePopup'] ?? null,
'use_backendpopups' => $serendipity['enableBackendPopup'] ?? null,
'force_backendpopups' => $force_backendpopups,
'is_embedded' => (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) ? false : true,
'is_raw_mode' => $serendipity['smarty_raw_mode'],
'is_raw_mode' => $serendipity['smarty_raw_mode'] ?? null,
'is_logged_in' => serendipity_userLoggedIn(),
'entry_id' => (isset($serendipity['GET']['id']) && is_numeric($serendipity['GET']['id'])) ? $serendipity['GET']['id'] : false,
@ -1098,11 +1102,11 @@ function serendipity_smarty_init($vars = array()) {
'category' => $category,
'category_info' => $category_info,
'template' => $serendipity['template'],
'template_backend' => $serendipity['template_backend'],
'wysiwygToolbar' => $serendipity['wysiwygToolbar'],
'template_backend' => $serendipity['template_backend'] ?? null,
'wysiwygToolbar' => $serendipity['wysiwygToolbar'] ?? null,
'wysiwyg_customPlugin' => $wysiwyg_customPlugin,
'wysiwyg_customConfig' => $wysiwyg_customConfig,
'use_autosave' => (serendipity_db_bool($serendipity['use_autosave']) ? 'true' : 'false'),
'use_autosave' => (serendipity_db_bool($serendipity['use_autosave'] ?? false) ? 'true' : 'false'),
'dateRange' => (!empty($serendipity['range']) ? $serendipity['range'] : array())
)