Changeset 21403 for trunk/wp-includes/load.php

Timestamp:

08/02/2012 06:31:14 PM (13 years ago)

Author:

ryan

Message:

Introduce wp_cache_switch_to_blog() and WP_Object_Cache::switch_to_blog() as a lighter/faster way to switch the cache to a new blog id.

Add the blog id to the cache keys for multisite installs.

Use wp_cache_switch_to_blog() instead of wp_cache_init() in switch_to_blog().

Use wp_cache_switch_to_blog() instead of wp_cache_reset() in wp_start_object_cache().

Deprecate wp_cache_reset().

This avoids the many queries needed to re-prime the cache after switch_to_blog() on multisite installs using the default cache backend.

fixes #21434

File:

• trunk/wp-includes/load.php (modified) (2 diffs)

trunk/wp-includes/load.php

@@ -382 +382 @@
  */
 function wp_start_object_cache() {
-    global $_wp_using_ext_object_cache;
+    global $_wp_using_ext_object_cache, $blog_id;
 
     $first_init = false;
@@ -404 +404 @@
     // Reset signals to the cache that global IDs have changed and it may need to update keys
     // and cleanup caches.
-    if ( !$first_init && function_exists('wp_cache_reset') )
-        wp_cache_reset();
+    if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) )
+        wp_cache_switch_to_blog( $blog_id );
     else
         wp_cache_init();