From f062347afe7b238e44dd48ba4b86c7fe3902dafa Mon Sep 17 00:00:00 2001 From: Mario Hommel Date: Tue, 22 Nov 2022 21:57:04 +0100 Subject: [PATCH] Fixes for PHP8 --- serendipity_event_dsgvo_gdpr/ChangeLog | 1 + .../serendipity_event_dsgvo_gdpr.php | 6 +++--- serendipity_event_entrypaging/ChangeLog | 4 ++++ .../serendipity_event_entrypaging.php | 7 +++++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/serendipity_event_dsgvo_gdpr/ChangeLog b/serendipity_event_dsgvo_gdpr/ChangeLog index b2b1f9ac..b70a536a 100644 --- a/serendipity_event_dsgvo_gdpr/ChangeLog +++ b/serendipity_event_dsgvo_gdpr/ChangeLog @@ -1,3 +1,4 @@ +1.3.2: More Fixes for PHP8 1.3.1: Hotfixes for PHP 8 (surrim) 1.3: Shorten one more block for IPv6 comments 1.2.1: Really display legal information for plugins. diff --git a/serendipity_event_dsgvo_gdpr/serendipity_event_dsgvo_gdpr.php b/serendipity_event_dsgvo_gdpr/serendipity_event_dsgvo_gdpr.php index 97c0bf2f..54d3b9e9 100644 --- a/serendipity_event_dsgvo_gdpr/serendipity_event_dsgvo_gdpr.php +++ b/serendipity_event_dsgvo_gdpr/serendipity_event_dsgvo_gdpr.php @@ -17,7 +17,7 @@ class serendipity_event_dsgvo_gdpr extends serendipity_event $propbag->add('description', PLUGIN_EVENT_DSGVO_GDPR_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Serendipity Team'); - $propbag->add('version', '1.3.1'); + $propbag->add('version', '1.3.2'); $propbag->add('requirements', array( 'serendipity' => '2.0', 'smarty' => '2.6.7', @@ -324,7 +324,7 @@ class serendipity_event_dsgvo_gdpr extends serendipity_event function isActive() { global $serendipity; - if ($serendipity['GET']['subpage'] == 'dsgvo_gdpr_privacy') { + if ($serendipity['GET']['subpage']?? ' ' == 'dsgvo_gdpr_privacy') { return true; } @@ -498,7 +498,7 @@ class serendipity_event_dsgvo_gdpr extends serendipity_event ?>
- > + >
add('description', PLUGIN_ENTRYPAGING_BLAHBLAH); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking, Wesley Hwang-Chung'); - $propbag->add('version', '1.41'); + $propbag->add('version', '1.42'); $propbag->add('requirements', array( 'serendipity' => '1.6', 'smarty' => '2.6.7', @@ -102,6 +102,7 @@ class serendipity_event_entrypaging extends serendipity_event if (class_exists('serendipity_event_multilingual')) { $localtitle = serendipity_db_query("SELECT value FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid = {$resultset[0]['id']} AND property = 'multilingual_title_{$serendipity['lang']}'", true, "both", false, false, false, true); } + $localtitle = $_GET ['localtitle'] ?? 'not set'; if (!is_array($localtitle)) { $localtitle = array(0 => $resultset[0]['title']); } @@ -198,7 +199,9 @@ class serendipity_event_entrypaging extends serendipity_event serendipity_plugin_api::hook_event('frontend_fetchentry', $cond); if (serendipity_db_bool($this->get_config('use_category')) && !empty($currentTimeSQL['categoryid'])) { $cond['joins'] .= " JOIN {$serendipity['dbPrefix']}entrycat AS ec ON (ec.categoryid = " . (int)$currentTimeSQL['categoryid'] . " AND ec.entryid = e.id)"; - } + } else { + $cond['joins'] = NULL; + } $querystring = "SELECT e.id, e.title, e.timestamp