37958.patch on Ticket #37958 – Attachment – WordPress Trac

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

IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8

                         $primary_blog_id = (int) $active_blog->blog_id;
+                }
+                $site_state = get_site_state();
                 foreach ( $blogs as $blog ) {
                         // Don't include blogs that aren't hosted at this site.
                         if ( $blog->site_id != get_current_network_id() )
 …
                                 'blogName'  => get_option( 'blogname' ),
                                 'xmlrpc'    => site_url( 'xmlrpc.php', 'rpc' ),
                         );
-                        restore_current_blog();
+                }
+                restore_site_state( $site_state );
                 return $struct;
+        }

IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8

+<?php
+/**
+ * Site API: WP_Site_State class
+ *
+ * @package WordPress
+ * @subpackage Multisite
+ * @since 4.8.0
+ */
+/**
+ * Core class used for storing and restoring site states.
+ *
+ * @since 4.8.0
+ */
+class WP_Site_State {
+        /**
+         * @var int
+         */
+        private $site_id;
+        /**
+         * @var array
+         */
+        private $stack;
+        /**
+         * Constructor. Sets up the properties.
+         *
+         * @since 4.8.0
+         *
+         * @global array $_wp_switched_stack
+         */
+        public function __construct() {
+                $this->site_id = get_current_blog_id();
+                $this->stack = $GLOBALS['_wp_switched_stack'];
+        }
+        /**
+         * Restores the stored site state.
+         *
+         * @since 4.8.0
+         *
+         * @global array $_wp_switched_stack
+         * @global bool $switched
+         *
+         * @return int The current site ID.
+         */
+        public function restore() {
+                switch_to_blog( $this->site_id );
+                $GLOBALS['_wp_switched_stack'] = $this->stack;
+                $GLOBALS['switched'] = ! empty( $this->stack );
+                return get_current_blog_id();
+        }
+}

IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8

         $blogs = get_blogs_of_user( $id );
         if ( ! empty( $blogs ) ) {
+                $site_state = get_site_state();
                 foreach ( $blogs as $blog ) {
                         switch_to_blog( $blog->userblog_id );
                         remove_user_from_blog( $id, $blog->userblog_id );
 …
                                 foreach ( $link_ids as $link_id )
                                         wp_delete_link( $link_id );
+                        }
-                        restore_current_blog();
+                }
+                restore_site_state( $site_state );
+        }
         $meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );

IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8

         return $network;
+}
+/**
+ * Returns a new object holding the current site state.
+ *
+ * @since 4.8.0
+ *
+ * @return WP_Site_State A new site state object.
+ */
+function get_site_state() {
+        return new WP_Site_State();
+}
+/**
+ * Restores the given site state.
+ *
+ * @since 4.8.0
+ *
+ * @param WP_Site_State $site_state The object holding the site state to be restored.
+ *
+ * @return int The current site ID.
+ */
+function restore_site_state( WP_Site_State $site_state ) {
+        return $site_state->restore();
+}

IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8

                 ),
         ) );
+        $site_state = get_site_state();
         foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
                 switch_to_blog( $blog->userblog_id );
 …
                         'title'  => __( 'Visit Site' ),
                         'href'   => home_url( '/' ),
                 ) );
-                restore_current_blog();
+        }
+        restore_site_state( $site_state );
+}
 /**

IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8

 /** WP_Site class */
 require_once( ABSPATH . WPINC . '/class-wp-site.php' );
+/** WP_Site_State class */
+require_once( ABSPATH . WPINC . '/class-wp-site-state.php' );
 /** Multisite loader */
 require_once( ABSPATH . WPINC . '/ms-load.php' );