Ticket #2377: 2377.diff

wp-includes/functions.php

@@ -2283 +2283 @@
         return $wpdb->num_queries;
 }
 
+function deactivate_plugins() {
+        update_option('active_plugins', array());
+}
+
 ?>

wp-settings.php

@@ -170 +170 @@
                 require(ABSPATH . '/my-hacks.php');
 }
 
-if ( get_settings('active_plugins') ) {
+if ( get_settings('active_plugins') && !defined('WP_INSTALLING') ) {
         $current_plugins = get_settings('active_plugins');
         if ( is_array($current_plugins) ) {
                 foreach ($current_plugins as $plugin) {

wp-admin/upgrade.php

@@ -75 +75 @@
         break;
         
         case 1:
+        deactivate_plugins();
         wp_cache_flush();
         make_db_current_silent();
         upgrade_all();