From 01c531746af666e449fb19b9a32556342b7740a5 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Mon, 22 Sep 2014 12:55:01 +0000
Subject: bug fixed: no need to check the table piwigo_plugins, this table
 always exists at this point

git-svn-id: http://piwigo.org/svn/trunk@29735 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 upgrade.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'upgrade.php')

diff --git a/upgrade.php b/upgrade.php
index 5a726fc77..175885715 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -279,6 +279,8 @@ if ($has_remote_site)
 // +-----------------------------------------------------------------------+
 
 $tables = get_tables();
+// echo '<pre>'; print_r($tables); echo '</pre>';
+// echo 'PREFIX_TABLE='.PREFIX_TABLE.'<br>';
 $columns_of = get_columns_of($tables);
 
 // find the current release
@@ -409,12 +411,8 @@ if ((isset($_POST['submit']) or isset($_GET['now']))
       }
     }
 
-    // Plugins deactivation
-    if (in_array(PREFIX_TABLE.'plugins', $tables))
-    {
-      deactivate_non_standard_plugins();
-    }
-
+    // Deactivate non standard extensions
+    deactivate_non_standard_plugins();
     deactivate_non_standard_themes();
     deactivate_templates();
 
-- 
cgit v1.2.3