From 48f820cc331b0b4eac9b89964a41050bdd0f6a1b Mon Sep 17 00:00:00 2001 From: onli Date: Mon, 9 Jun 2014 21:42:17 +0200 Subject: [PATCH] Don't show stackable-error on plugin upgrade (#45) --- include/admin/plugins.inc.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/include/admin/plugins.inc.php b/include/admin/plugins.inc.php index 226316b3..c7dc8805 100644 --- a/include/admin/plugins.inc.php +++ b/include/admin/plugins.inc.php @@ -344,17 +344,20 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) { // we now have to check that the plugin is not already installed, or stackable, to prevent invalid double instances $new_plugin = true; - foreach (serendipity_plugin_api::get_installed_plugins() as $pluginName) { - if ($serendipity['GET']['install_plugin'] === $pluginName) { - $existingPlugin =& serendipity_plugin_api::load_plugin($serendipity['GET']['install_plugin']); - if (is_object($existingPlugin)) { - $bag = new serendipity_property_bag(); - $existingPlugin->introspect($bag); - if ($bag->get('stackable') != true) { - $new_plugin = false; + if ($fetchplugin_data['install']) { + // spartacus will set this to false on upgrade, and we want to check this only on install + foreach (serendipity_plugin_api::get_installed_plugins() as $pluginName) { + if ($serendipity['GET']['install_plugin'] === $pluginName) { + $existingPlugin =& serendipity_plugin_api::load_plugin($serendipity['GET']['install_plugin']); + if (is_object($existingPlugin)) { + $bag = new serendipity_property_bag(); + $existingPlugin->introspect($bag); + if ($bag->get('stackable') != true) { + $new_plugin = false; + } } + break; } - break; } }