feature:2260

Keep only two states for plugins (active and inactive)

git-svn-id: http://piwigo.org/svn/trunk@10293 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 2 insertions, 7 deletions

diff --git a/admin/plugins_list.php b/admin/plugins_list.php
index 1af2e239b..4ec64ec29 100644
--- a/admin/plugins_list.php
+++ b/admin/plugins_list.php
@@ -97,16 +97,12 @@ foreach($plugins->fs_plugins as $plugin_id => $fs_plugin)
   }
   else
   {
-    $tpl_plugin['STATE'] = 'uninstalled';
+    $tpl_plugin['STATE'] = 'inactive';
   }
 
   if (isset($fs_plugin['extension']) and in_array($fs_plugin['extension'], $_SESSION['merged_extensions']))
   {
-    switch($tpl_plugin['STATE'])
-    {
-      case 'active': $plugins->perform_action('deactivate', $plugin_id);
-      case 'inactive': $plugins->perform_action('uninstall', $plugin_id);
-    }
+    $plugins->perform_action('uninstall', $plugin_id);
     $tpl_plugin['STATE'] = 'merged';
     $tpl_plugin['DESC'] = l10n('THIS PLUGIN IS NOW PART OF PIWIGO CORE! DELETE IT NOW.');
     $merged_plugins = true;
@@ -117,7 +113,6 @@ foreach($plugins->fs_plugins as $plugin_id => $fs_plugin)
 
 $template->append('plugin_states', 'active');
 $template->append('plugin_states', 'inactive');
-$template->append('plugin_states', 'uninstalled');
 
 if ($merged_plugins)
 {