From e2a288eb6add451fcdf6c99a4fac2e0ba5ccf31b Mon Sep 17 00:00:00 2001 From: patdenice Date: Fri, 7 Oct 2011 13:04:01 +0000 Subject: merge r12359-12360 from trunk to branch 2.3 Avoid error if several obsolet plugins have to be uninstalled. It's better to only deactivate obsolete plugins on loading. git-svn-id: http://piwigo.org/svn/branches/2.3@12378 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/plugins_installed.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/admin/plugins_installed.php b/admin/plugins_installed.php index 62962dfba..e12405dd8 100644 --- a/admin/plugins_installed.php +++ b/admin/plugins_installed.php @@ -138,7 +138,10 @@ foreach($plugins->fs_plugins as $plugin_id => $fs_plugin) if (isset($fs_plugin['extension']) and isset($merged_extensions[$fs_plugin['extension']])) { - $plugins->perform_action('uninstall', $plugin_id); + // Deactivate manually plugin from database + $query = 'UPDATE '.PLUGINS_TABLE.' SET state=\'inactive\' WHERE id=\''.$plugin_id.'\''; + pwg_query($query); + $tpl_plugin['STATE'] = 'merged'; $tpl_plugin['DESC'] = l10n('THIS PLUGIN IS NOW PART OF PIWIGO CORE! DELETE IT NOW.'); $merged_plugins = true; -- cgit v1.2.3