Changeset 29735

Timestamp:

Sep 22, 2014, 2:55:01 PM (10 years ago)

Author:

plg

Message:

bug fixed: no need to check the table piwigo_plugins, this table always exists at this point

Location:

trunk

Files:

• admin/include/functions_upgrade.php (modified) (1 diff)
• admin/include/updates.class.php (modified) (1 diff)
• upgrade.php (modified) (2 diffs)

trunk/admin/include/functions_upgrade.php

@@ -78 +78 @@
     'AdminTools',
     'TakeATour',
-    'event_tracer',
     'language_switch',
     'LocalFilesEditor'

trunk/admin/include/updates.class.php

@@ -45 +45 @@
       $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');
 

trunk/upgrade.php

@@ -280 +280 @@
 
 $tables = get_tables();
+// echo '<pre>'; print_r($tables); echo '</pre>';
+// echo 'PREFIX_TABLE='.PREFIX_TABLE.'<br>';
 $columns_of = get_columns_of($tables);
 
@@ -410 +412 @@
     }
 
-    // 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();