Changeset 38457 for trunk/src/wp-includes/load.php

Timestamp:

08/31/2016 04:55:01 AM (8 years ago)

Author:

wonderboymusic

Message:

Multisite: use get_current_blog_id() where applicable, in lieu of plucking the $blog_id global from outer space.

See #37699.

File:

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

trunk/src/wp-includes/load.php

@@ -471 +471 @@
  * @since 3.0.0
  * @access private
- *
- * @global int $blog_id Blog ID.
  */
 function wp_start_object_cache() {
-    global $blog_id;
-
     $first_init = false;
     if ( ! function_exists( 'wp_cache_init' ) ) {
         if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
             require_once ( WP_CONTENT_DIR . '/object-cache.php' );
-            if ( function_exists( 'wp_cache_init' ) )
+            if ( function_exists( 'wp_cache_init' ) ) {
                 wp_using_ext_object_cache( true );
+            }
         }
 
@@ -496 +493 @@
     }
 
-    if ( ! wp_using_ext_object_cache() )
+    if ( ! wp_using_ext_object_cache() ) {
         require_once ( ABSPATH . WPINC . '/cache.php' );
+    }
 
     /*
@@ -504 +502 @@
      * have changed and it may need to update keys and cleanup caches.
      */
-    if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) )
-        wp_cache_switch_to_blog( $blog_id );
-    elseif ( function_exists( 'wp_cache_init' ) )
+    if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) ) {
+        wp_cache_switch_to_blog( get_current_blog_id() );
+    } elseif ( function_exists( 'wp_cache_init' ) ) {
         wp_cache_init();
+    }
 
     if ( function_exists( 'wp_cache_add_global_groups' ) ) {