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

Timestamp:

09/27/2017 09:43:59 PM (7 years ago)

Author:

flixos90

Message:

Multisite: Improve initializing available roles when switch sites.

Switching the available roles and the current user's capabilities no longer happens in switch_to_blog() and restore_current_blog(), instead it has been moved to a new function wp_switch_roles_and_user() which is hooked into the site switching process. This allows to improve performance by temporarily unhooking the function when roles and capabilities do not need to be switched.

This change ensures that switching available roles now works closer to switching user capabilities, particularly the changes in [41624]. A new WP_Roles::for_site( $site_id ) method has been introduced, and the WP_Roles::_init() method has been deprecated. It is furthermore possible to retrieve the site ID for which the available roles are currently initialized through a new WP_Roles::get_site_id().

Props johnjamesjacoby, flixos90.
Fixes #38645.

File:

• trunk/src/wp-includes/ms-blogs.php (modified) (5 diffs)

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

@@ -793 +793 @@
  */
 function switch_to_blog( $new_blog, $deprecated = null ) {
-    global $wpdb, $wp_roles;
+    global $wpdb;
 
     $blog_id = get_current_blog_id();
@@ -848 +848 @@
     }
 
-    if ( did_action( 'init' ) ) {
-        $wp_roles = new WP_Roles();
-        $current_user = wp_get_current_user();
-        $current_user->for_site( $new_blog );
-    }
-
     /** This filter is documented in wp-includes/ms-blogs.php */
     do_action( 'switch_blog', $new_blog, $prev_blog_id );
@@ -877 +871 @@
  */
 function restore_current_blog() {
-    global $wpdb, $wp_roles;
+    global $wpdb;
 
     if ( empty( $GLOBALS['_wp_switched_stack'] ) ) {
@@ -922 +916 @@
     }
 
-    if ( did_action( 'init' ) ) {
-        $wp_roles = new WP_Roles();
-        $current_user = wp_get_current_user();
-        $current_user->for_site( $blog );
-    }
-
     /** This filter is documented in wp-includes/ms-blogs.php */
     do_action( 'switch_blog', $blog, $prev_blog_id );
@@ -935 +923 @@
 
     return true;
+}
+
+/**
+ * Switches the initialized roles and current user capabilities to another site.
+ *
+ * @since 4.9.0
+ *
+ * @param int $new_site_id New site ID.
+ * @param int $old_site_id Old site ID.
+ */
+function wp_switch_roles_and_user( $new_site_id, $old_site_id ) {
+    if ( $new_site_id == $old_site_id ) {
+        return;
+    }
+
+    if ( ! did_action( 'init' ) ) {
+        return;
+    }
+
+    wp_roles()->for_site( $new_site_id );
+    wp_get_current_user()->for_site( $new_site_id );
 }