Ticket #40513: 40513.diff

src/wp-includes/ms-blogs.php

@@ -788 +788 @@
  * @global string          $table_prefix
  * @global WP_Object_Cache $wp_object_cache
  *
- * @param int  $new_blog   The id of the blog you want to switch to. Default: current blog
+ * @param WP_Site|int  $new_blog   The id of the blog you want to switch to. Default: current blog
  * @param bool $deprecated Deprecated argument
  * @return true Always returns True.
  */
@@ -796 +796 @@
         global $wpdb, $wp_roles;
 
         $blog_id = get_current_blog_id();
+        $site_object = false;
         if ( empty( $new_blog ) ) {
                 $new_blog = $blog_id;
+        } else if ( $new_blog instanceof WP_Site ) {
+                $site_object = $new_blog;
+                $new_blog = $site_object->blog_id;
         }
 
         $GLOBALS['_wp_switched_stack'][] = $blog_id;
@@ -815 +819 @@
                  *
                  * @param int $new_blog New blog ID.
                  * @param int $new_blog Blog ID.
+                 * @param WP_Site $site_object Optional Site object.
                  */
-                do_action( 'switch_blog', $new_blog, $new_blog );
+                do_action( 'switch_blog', $new_blog, $new_blog, $site_object );
                 $GLOBALS['switched'] = true;
                 return true;
         }
@@ -855 +860 @@
         }
 
         /** This filter is documented in wp-includes/ms-blogs.php */
-        do_action( 'switch_blog', $new_blog, $prev_blog_id );
+        do_action( 'switch_blog', $new_blog, $prev_blog_id, $site_object );
         $GLOBALS['switched'] = true;
 
         return true;
@@ -888 +893 @@
 
         if ( $blog_id == $blog ) {
                 /** This filter is documented in wp-includes/ms-blogs.php */
-                do_action( 'switch_blog', $blog, $blog );
+                do_action( 'switch_blog', $blog, $blog, false );
                 // If we still have items in the switched stack, consider ourselves still 'switched'
                 $GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
                 return true;
@@ -929 +934 @@
         }
 
         /** This filter is documented in wp-includes/ms-blogs.php */
-        do_action( 'switch_blog', $blog, $prev_blog_id );
+        do_action( 'switch_blog', $blog, $prev_blog_id, false );
 
         // If we still have items in the switched stack, consider ourselves still 'switched'
         $GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );