Ticket #5389: cache_suspend.diff

wp-includes/cache.php

@@ -43 +43 @@
         return $wp_object_cache->replace($key, $data, $flag, $expire);
 }
 
+function wp_cache_resume() {
+        global $wp_object_cache;
+
+        $wp_object_cache->cache_suspended = false;
+}
+
 function wp_cache_set($key, $data, $flag = '', $expire = 0) {
         global $wp_object_cache;
         $data = unserialize(serialize($data));
@@ -50 +56 @@
         return $wp_object_cache->set($key, $data, $flag, $expire);
 }
 
+function wp_cache_suspend() {
+        global $wp_object_cache;
+
+        $wp_object_cache->cache_suspended = true;
+}
+
 define('CACHE_SERIAL_HEADER', "<?php\n/*");
 define('CACHE_SERIAL_FOOTER', "*/\n?".">");
 
 class WP_Object_Cache {
         var $cache_dir;
         var $cache_enabled = false;
+        var $cache_suspended = false;
         var $expiration_time = 900;
         var $flock_filename = 'wp_object_cache.lock';
         var $mutex;
@@ -120 +133 @@
         }
 
         function get($id, $group = 'default', $count_hits = true) {
+                if ( $this->cache_suspended )
+                        return false;
+
                 if (empty ($group))
                         $group = 'default';
 
@@ -264 +280 @@
         }
 
         function set($id, $data, $group = 'default', $expire = '') {
+                if ( $this->cache_suspended )
+                        return true;
+
                 if (empty ($group))
                         $group = 'default';
 

wp-admin/includes/upgrade.php

@@ -11 +11 @@
 
         wp_check_mysql_version();
         wp_cache_flush();
+        wp_cache_suspend();
         make_db_current_silent();
         populate_options();
         populate_roles();
@@ -50 +51 @@
 
         wp_new_blog_notification($blog_title, $guessurl, $user_id, $random_password);
 
-        wp_cache_flush();
-
         return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $random_password);
 }
 endif;

wp-admin/admin.php

@@ -97 +97 @@
         require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
         define('WP_IMPORTING', true);
+        wp_cache_suspend();
 
         call_user_func($wp_importers[$importer][2]);