From 4cab1db38d61ff823427f34eff05c78b2f428345 Mon Sep 17 00:00:00 2001 From: onli Date: Thu, 13 May 2021 14:13:58 +0200 Subject: [PATCH] php 8 compat: Image upload --- include/admin/images.inc.php | 4 ++-- include/functions_images.inc.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php index bd9fecf8..53304b90 100644 --- a/include/admin/images.inc.php +++ b/include/admin/images.inc.php @@ -31,7 +31,7 @@ if (!empty($serendipity['COOKIE']['serendipity_toggle_dir'])) { $messages = array(); // submitted media_upload.tpl: check for empty file field and redirect back to media_upload -if ( $serendipity['GET']['adminAction'] == 'add' && !$serendipity['POST']['adminSubAction'] == 'properties') { +if ( $serendipity['GET']['adminAction'] == 'add' && ! ($serendipity['POST']['adminSubAction'] ?? null) == 'properties') { if ((empty($serendipity['POST']['imageurl']) || $serendipity['POST']['imageurl'] == 'http://' ) && empty($_FILES['serendipity']['name']['userfile'][1])) { @@ -229,7 +229,7 @@ switch ($serendipity['GET']['adminAction']) { } $data['case_add'] = true; - if ($serendipity['POST']['adminSubAction'] == 'properties') { + if (($serendipity['POST']['adminSubAction'] ?? null) == 'properties') { serendipity_restoreVar($serendipity['COOKIE']['serendipity_only_path'], $serendipity['GET']['only_path']); // restore last set directory path, see true parameter $properties = serendipity_parsePropertyForm(); $image_id = $properties['image_id']; diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php index 47a33b33..0e148d42 100644 --- a/include/functions_images.inc.php +++ b/include/functions_images.inc.php @@ -1726,7 +1726,7 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa serendipity_prepareMedia($serendipity['imageList'][$k], $url); - if ($serendipity['parseMediaOverview']) { + if ($serendipity['parseMediaOverview'] ?? false) { $serendipity['imageList'][$k]['props'] =& $allprops[$file['id']]; if (!is_array($serendipity['imageList'][$k]['props']['base_metadata'])) { $serendipity['imageList'][$k]['metadata'] =& serendipity_getMetaData($serendipity['imageList'][$k]['realfile'], $serendipity['imageList'][$k]['header']);