Ticket #40513: 40513.3.diff

src/wp-admin/includes/class-wp-ms-sites-list-table.php

@@ -330 +330 @@
                 </strong>
                 <?php
                 if ( 'list' !== $mode ) {
-                        switch_to_blog( $blog['blog_id'] );
+                        switch_to_blog( get_site( $blog['blog_id'] ) );
                         echo '<p>';
                         printf(
                                 /* translators: 1: site name, 2: site tagline. */

src/wp-admin/includes/ms.php

@@ -231 +231 @@
 
         if ( ! empty( $blogs ) ) {
                 foreach ( $blogs as $blog ) {
-                        switch_to_blog( $blog->userblog_id );
+                        switch_to_blog( get_site( $blog ) );
                         remove_user_from_blog( $id, $blog->userblog_id );
 
                         $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );

src/wp-admin/network/site-themes.php

@@ -69 +69 @@
 $is_main_site = is_main_site( $id );
 
 if ( $action ) {
-        switch_to_blog( $id );
+        switch_to_blog( $details );
         $allowed_themes = get_option( 'allowedthemes' );
 
         switch ( $action ) {

src/wp-admin/network/site-users.php

@@ -61 +61 @@
 
 $is_main_site = is_main_site( $id );
 
-switch_to_blog( $id );
+switch_to_blog( $details );
 
 $action = $wp_list_table->current_action();
 

src/wp-includes/admin-bar.php

@@ -508 +508 @@
         ) );
 
         foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
-                switch_to_blog( $blog->userblog_id );
+                switch_to_blog( get_site( $blog ) );
 
                 $blavatar = '<div class="blavatar"></div>';
 

src/wp-includes/class-wp-site.php

@@ -334 +334 @@
 
                 if ( false === $details ) {
 
-                        switch_to_blog( $this->blog_id );
+                        switch_to_blog( $this );
                         // Create a raw copy of the object for backwards compatibility with the filter below.
                         $details = new stdClass();
                         foreach ( get_object_vars( $this ) as $key => $value ) {

src/wp-includes/class-wp-xmlrpc-server.php

@@ -632 +632 @@
                                 continue;
 
                         $blog_id = $blog->userblog_id;
-
-                        switch_to_blog( $blog_id );
+                        $site = get_site( $blog );
+                        switch_to_blog( $site );
 
                         $is_admin = current_user_can( 'manage_options' );
                         $is_primary = ( (int) $blog_id === $primary_blog_id );

src/wp-includes/ms-blogs.php

@@ -229 +229 @@
                 return $details;
         }
 
-        switch_to_blog( $blog_id );
+        switch_to_blog( $details );
         $details->blogname   = get_option( 'blogname' );
         $details->siteurl    = get_option( 'siteurl' );
         $details->post_count = get_option( 'post_count' );
@@ -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;
@@ -877 +882 @@
  * @return bool True on success, false if we're already on the current blog
  */
 function restore_current_blog() {
-        global $wpdb, $wp_roles;
+        global $wpdb, $wp_roles, $current_blog;
 
         if ( empty( $GLOBALS['_wp_switched_stack'] ) ) {
                 return false;
@@ -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, $current_blog );
                 // 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, $current_blog );
 
         // If we still have items in the switched stack, consider ourselves still 'switched'
         $GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );

src/wp-includes/ms-functions.php

@@ -1170 +1170 @@
         if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
                 return new WP_Error('insert_blog', __('Could not create site.'));
 
-        switch_to_blog($blog_id);
+        switch_to_blog( get_site( $blog_id ) );
         install_blog($blog_id, $title);
         wp_install_defaults($user_id);