From 524b26d0d5124581d5fbaf2c2e7024104b52a939 Mon Sep 17 00:00:00 2001 From: onli Date: Tue, 14 Aug 2018 22:40:07 +0200 Subject: [PATCH] freetag: Fix php 7 issue by avoiding counting a non-array (#80) --- serendipity_event_freetag/ChangeLog | 2 ++ serendipity_event_freetag/serendipity_event_freetag.php | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/serendipity_event_freetag/ChangeLog b/serendipity_event_freetag/ChangeLog index a5b5f970..024ce19f 100644 --- a/serendipity_event_freetag/ChangeLog +++ b/serendipity_event_freetag/ChangeLog @@ -1,3 +1,5 @@ +3.70: Fix php 7 compatibility issue by avoiding counting a non-array + 3.69: Fix possible SQL injection for tagnames, Thanks to Brian carpenter (geeknik) and Hanno BĂck 3.67: Iconfont a11y fix (yellowled) diff --git a/serendipity_event_freetag/serendipity_event_freetag.php b/serendipity_event_freetag/serendipity_event_freetag.php index 5bfa3fd5..dfbdaea4 100644 --- a/serendipity_event_freetag/serendipity_event_freetag.php +++ b/serendipity_event_freetag/serendipity_event_freetag.php @@ -72,7 +72,7 @@ class serendipity_event_freetag extends serendipity_event 'smarty' => '2.6.7', 'php' => '4.1.0' )); - $propbag->add('version', '3.69'); + $propbag->add('version', '3.70'); $propbag->add('event_hooks', array( 'frontend_fetchentries' => true, 'frontend_fetchentry' => true, @@ -1346,7 +1346,11 @@ addLoadEvent(enableAutocomplete); $show_related = serendipity_db_bool($this->get_config('show_related', true)); - $elements = count($eventData); + if (is_array($eventData)) { + $elements = count($eventData); + } else { + return; + } // If not using extended-smarty, we want related entries only when // showing only one entry. It is better to ask Smarty here than doing