Changeset 12378

Timestamp:

Oct 7, 2011, 3:04:01 PM (13 years ago)

Author:

patdenice

Message:

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.

File:

• branches/2.3/admin/plugins_installed.php (modified) (1 diff)

branches/2.3/admin/plugins_installed.php

@@ -139 +139 @@
   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.');