From 080501476128143b81107a5ddf09b446de466a7d Mon Sep 17 00:00:00 2001 From: Thomas Hochstein Date: Sat, 17 Aug 2019 18:14:26 +0200 Subject: [PATCH] [event_spartacus] Fix upgrade counter. The plugin name was derived from its install path - but bundled sidebar and event plugins may share a path. So use the name instead (and strip the instance hash from it). Signed-off-by: Thomas Hochstein --- plugins/serendipity_event_spartacus/ChangeLog | 8 +++++++- .../serendipity_event_spartacus.php | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/plugins/serendipity_event_spartacus/ChangeLog b/plugins/serendipity_event_spartacus/ChangeLog index f36c3e8d..70c1760e 100644 --- a/plugins/serendipity_event_spartacus/ChangeLog +++ b/plugins/serendipity_event_spartacus/ChangeLog @@ -1,5 +1,11 @@ -2.38: +2.38.1: ------- + * Fix count_plugin_upgrades(): + Don't get plugin name from path, as event and sidebar plugins + may share their path; strip instance from name instead. + +2.38: +----- * Add function to count upgradeable plugins. * Add upgrade notifier to plugin upgrade button. * Add 'backend_plugins_upgradecount' hook and diff --git a/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php b/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php index f7c55806..d0f99846 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.38'); + $propbag->add('version', '2.38.1'); $propbag->add('requirements', array( 'serendipity' => '1.6', )); @@ -1152,7 +1152,7 @@ class serendipity_event_spartacus extends serendipity_event // Object is returned when a plugin could not be cached. $bag = new serendipity_property_bag; $plugin->introspect($bag); - $pluginname = get_object_vars($plugin)['act_pluginPath']; + $pluginname = explode(':', $class_data['name'])[0]; $version = $bag->get('version'); } elseif (is_array($plugin)) { // Array is returned if a plugin could be fetched from info cache