From 15f0be45a270cf6fc4d2351fcb41e54706b2324f Mon Sep 17 00:00:00 2001
From: Thomas Hochstein <thh@inter.net>
Date: Sat, 10 Aug 2019 22:02:36 +0200
Subject: [PATCH] [event_spartacus] Don't cache wrong plugin list.

Declaring $pluginlist as static will cache the
database query results and always return the same
list of plugins - no matter which type is queried
(sidebar or event).

This cache must be busted if another type of
plugins is queried.

Backported from master.

Signed-off-by: Thomas Hochstein <thh@inter.net>
---
 plugins/serendipity_event_spartacus/ChangeLog         |  4 ++++
 .../serendipity_event_spartacus.php                   | 11 ++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/plugins/serendipity_event_spartacus/ChangeLog b/plugins/serendipity_event_spartacus/ChangeLog
index c5d0423d..9db414d9 100644
--- a/plugins/serendipity_event_spartacus/ChangeLog
+++ b/plugins/serendipity_event_spartacus/ChangeLog
@@ -1,3 +1,7 @@
+2.37.6:
+-------
+    * Fix wrong caching of plugin lists regardless of type.
+
 2.37.5:
 -------
     * Fix missing reset to default after dropping netmirror.
diff --git a/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php b/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php
index 91fcc089..ae3b14d8 100644
--- a/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php
+++ b/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php
@@ -27,7 +27,7 @@ class serendipity_event_spartacus extends serendipity_event
         $propbag->add('description',   PLUGIN_EVENT_SPARTACUS_DESC);
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Garvin Hicking');
-        $propbag->add('version',       '2.37.5');
+        $propbag->add('version',       '2.37.6');
         $propbag->add('requirements',  array(
             'serendipity' => '1.6',
         ));
@@ -711,6 +711,13 @@ class serendipity_event_spartacus extends serendipity_event
     {
         global $serendipity;
         static $pluginlist = null;
+        static $cachedtype = null;
+
+        if (isset($cachedtype) && $cachedtype != $type) {
+            // bust cache if called with other type
+            $pluginlist = null;
+            $cachedtype = $type;
+        }
 
         if ($pluginlist === null) {
             $pluginlist = array();
@@ -736,6 +743,8 @@ class serendipity_event_spartacus extends serendipity_event
                 }
             }
         }
+        // save type of cached pluginlist
+        $cachedtype = $type;
 
         return $pluginlist;
     }