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

3 files changed, 5 insertions, 8 deletions

diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php
index 5f7df4078..b7a8763c5 100644
--- a/admin/include/functions_upgrade.php
+++ b/admin/include/functions_upgrade.php
@@ -77,7 +77,6 @@ function deactivate_non_standard_plugins()
   $standard_plugins = array(
     'AdminTools',
     'TakeATour',
-    'event_tracer',
     'language_switch',
     'LocalFilesEditor'
     );
diff --git a/admin/include/updates.class.php b/admin/include/updates.class.php
index d7ad76ed6..17a3b2578 100644
--- a/admin/include/updates.class.php
+++ b/admin/include/updates.class.php
@@ -44,7 +44,7 @@ class updates
     {

       $this->types = array($page);

     }

-    $this->default_themes = array('clear', 'dark', 'Sylvia', 'elegant');

+    $this->default_themes = array('clear', 'dark', 'Sylvia', 'elegant', 'smartpocket');

     $this->default_plugins = array('AdminTools', 'TakeATour', 'language_switch', 'LocalFilesEditor');

 

     foreach ($this->types as $type)

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();