aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2011-10-07 13:04:01 +0000
committerpatdenice <patdenice@piwigo.org>2011-10-07 13:04:01 +0000
commite2a288eb6add451fcdf6c99a4fac2e0ba5ccf31b (patch)
tree69eab8f135e6c2a78f5b9f2195b2e1b34df2d46d /admin
parent7464b29d223bc4de545daafabdc67df68041b9d3 (diff)
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
Diffstat (limited to '')
-rw-r--r--admin/plugins_installed.php5
1 files changed, 4 insertions, 1 deletions
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;