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

Timestamp:

02/12/2010 05:06:43 PM (16 years ago)

Author:

ryan

Message:

Preload commonly loaded site options when running multisite without a persistent cache. Introduce wp_cache_reset() and call it instead of wp_cache_init() when re-initing after the blog ID chanages to avoid throwing out the entire cache. Pass cached site options through the site option filter when fetching.

File:

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

trunk/wp-includes/load.php

@@ -319 +319 @@
  */
 function wp_start_object_cache() {
-    if ( ! function_exists( 'wp_cache_init' ) ) {
+    $first_init = false;
+    if ( ! function_exists( 'wp_cache_init' ) ) {
         global $_wp_using_ext_object_cache;
         if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
@@ -328 +329 @@
             $_wp_using_ext_object_cache = false;
         }
-    }
-
-    wp_cache_init();
+        $first_init = true;
+    }
+
+    // If cache supports reset, reset instead of init if already initialized.
+    // 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();
+    else
+        wp_cache_init();
+
     if ( function_exists( 'wp_cache_add_global_groups' ) ) {
         wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss' ) );