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

Timestamp:

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

Author:

ryan

Message:

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

File:

• trunk/wp-includes/load.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;
+                }
         }