From 53694e269114148518811d597a2ee5808b876d41 Mon Sep 17 00:00:00 2001 From: Thomas Hochstein Date: Sat, 28 Mar 2020 13:15:01 +0100 Subject: [PATCH] Unconditionally keep upgraded_version in plugin cache. See #685 for more information. Signed-off-by: Thomas Hochstein --- docs/NEWS | 2 ++ include/admin/plugins.inc.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/NEWS b/docs/NEWS index 098f5fe2..86df8fe5 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -1,6 +1,8 @@ Version 2.4-alpha1 () ------------------------------------------------------------------------ + * Fix: Don't drop upgraded_version from local plugin cache. + * Fix: Simplify count_plugin_upgrades() in event_spartacus. * Fix: Modified sql statement used for htaccess blocking to work in diff --git a/include/admin/plugins.inc.php b/include/admin/plugins.inc.php index 88c07c29..5c2b27e9 100644 --- a/include/admin/plugins.inc.php +++ b/include/admin/plugins.inc.php @@ -194,7 +194,7 @@ if (isset($serendipity['GET']['plugin_to_conf'])) { $plugin->introspect($bag); // If a foreign plugin is upgradable, keep the new version number. - if (isset($foreignPlugins['pluginstack'][$class_data['name']]) && $foreignPlugins['pluginstack'][$class_data['name']]['upgradable']) { + if (isset($foreignPlugins['pluginstack'][$class_data['name']]) && isset($foreignPlugins['pluginstack'][$class_data['name']]['upgrade_version'])) { $class_data['upgrade_version'] = $foreignPlugins['pluginstack'][$class_data['name']]['upgrade_version']; }