Ticket #45594: 45594.patch

wp-includes/ms-blogs.php

@@ -1636 +1636 @@
 function switch_to_blog( $new_blog, $deprecated = null ) {
         global $wpdb;
 
-        $blog_id = get_current_blog_id();
+    $prev_blog_id = get_current_blog_id();
         if ( empty( $new_blog ) ) {
-                $new_blog = $blog_id;
+                $new_blog = $prev_blog_id;
         }
 
-        $GLOBALS['_wp_switched_stack'][] = $blog_id;
+        $GLOBALS['_wp_switched_stack'][] = $prev_blog_id;
 
         /*
          * If we're switching to the same blog id that we're on,
          * set the right vars, do the associated actions, but skip
          * the extra unnecessary work
          */
-        if ( $new_blog == $blog_id ) {
+        if ( $new_blog == $prev_blog_id ) {
                 /**
                  * Fires when the blog is switched.
                  *
                  * @since MU (3.0.0)
                  *
                  * @param int $new_blog New blog ID.
-                 * @param int $new_blog Blog ID.
+                 * @param int $prev_blog_id Previous blog ID.
                  */
-                do_action( 'switch_blog', $new_blog, $new_blog );
+                do_action( 'switch_blog', $new_blog, $prev_blog_id );
                 $GLOBALS['switched'] = true;
                 return true;
         }
 
         $wpdb->set_blog_id( $new_blog );
         $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
-        $prev_blog_id            = $blog_id;
         $GLOBALS['blog_id']      = $new_blog;
 
         if ( function_exists( 'wp_cache_switch_to_blog' ) ) {