From 8ba29f8f4665fa396618c5a67d27610580375e67 Mon Sep 17 00:00:00 2001 From: patdenice Date: Thu, 6 Oct 2011 09:25:10 +0000 Subject: Avoid error if several obsolet plugins have to be uninstalled. git-svn-id: http://piwigo.org/svn/trunk@12359 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..9da31ccb5 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); + // Remove manually plugin from database + $query = 'DELETE FROM '.PLUGINS_TABLE.' 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