Changeset 12888

Timestamp:

01/28/2010 05:28:44 PM (15 years ago)

Author:

ryan

Message:

Clean up cache re-init code in Multisite. Props nacin. fixes #12065

Location:

trunk/wp-includes

Files:

• load.php (modified) (1 diff)
• ms-settings.php (modified) (1 diff)

trunk/wp-includes/load.php

@@ -319 +319 @@
  */
 function wp_start_object_cache() {
-    global $_wp_using_ext_object_cache;
-    if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
-        require_once ( WP_CONTENT_DIR . '/object-cache.php' );
-        $_wp_using_ext_object_cache = true;
-    } else {
-        require_once ( ABSPATH . WPINC . '/cache.php' );
-        $_wp_using_ext_object_cache = false;
+    if ( ! function_exists( 'wp_cache_init' ) ) {
+        global $_wp_using_ext_object_cache;
+        if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
+            require_once ( WP_CONTENT_DIR . '/object-cache.php' );
+            $_wp_using_ext_object_cache = true;
+        } else {
+            require_once ( ABSPATH . WPINC . '/cache.php' );
+            $_wp_using_ext_object_cache = false;
+        }
     }
 

trunk/wp-includes/ms-settings.php

@@ -153 +153 @@
     $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]);
 
-wp_cache_init(); // need to init cache again after blog_id is set
-if ( function_exists('wp_cache_add_global_groups') ) { // need to add these again. Yes, it's an ugly hack
-    wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss'));
-    wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
-}
+// need to init cache again after blog_id is set
+wp_start_object_cache();
 
 ms_default_constants( 'uploads' );