Changeset 38457 for trunk/src/wp-includes/ms-blogs.php

Timestamp:

08/31/2016 04:55:01 AM (9 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/ms-blogs.php (modified) (7 diffs)

trunk/src/wp-includes/ms-blogs.php

@@ -767 +767 @@
     global $wpdb;
 
-    if ( empty( $new_blog ) )
-        $new_blog = $GLOBALS['blog_id'];
-
-    $GLOBALS['_wp_switched_stack'][] = $GLOBALS['blog_id'];
+    $blog_id = get_current_blog_id();
+    if ( empty( $new_blog ) ) {
+        $new_blog = $blog_id;
+    }
+
+    $GLOBALS['_wp_switched_stack'][] = $blog_id;
 
     /*
@@ -777 +779 @@
      * the extra unnecessary work
      */
-    if ( $new_blog == $GLOBALS['blog_id'] ) {
+    if ( $new_blog == $blog_id ) {
         /**
          * Fires when the blog is switched.
@@ -793 +795 @@
     $wpdb->set_blog_id( $new_blog );
     $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
-    $prev_blog_id = $GLOBALS['blog_id'];
+    $prev_blog_id = $blog_id;
     $GLOBALS['blog_id'] = $new_blog;
 
@@ -801 +803 @@
         global $wp_object_cache;
 
-        if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
+        if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) ) {
             $global_groups = $wp_object_cache->global_groups;
-        else
+        } else {
             $global_groups = false;
-
+        }
         wp_cache_init();
 
@@ -849 +851 @@
     global $wpdb;
 
-    if ( empty( $GLOBALS['_wp_switched_stack'] ) )
+    if ( empty( $GLOBALS['_wp_switched_stack'] ) ) {
         return false;
+    }
 
     $blog = array_pop( $GLOBALS['_wp_switched_stack'] );
-
-    if ( $GLOBALS['blog_id'] == $blog ) {
+    $blog_id = get_current_blog_id();
+
+    if ( $blog_id == $blog ) {
         /** This filter is documented in wp-includes/ms-blogs.php */
         do_action( 'switch_blog', $blog, $blog );
@@ -863 +867 @@
 
     $wpdb->set_blog_id( $blog );
-    $prev_blog_id = $GLOBALS['blog_id'];
+    $prev_blog_id = $blog_id;
     $GLOBALS['blog_id'] = $blog;
     $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
@@ -872 +876 @@
         global $wp_object_cache;
 
-        if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
+        if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) ) {
             $global_groups = $wp_object_cache->global_groups;
-        else
+        } else {
             $global_groups = false;
+        }
 
         wp_cache_init();