Ticket #21459: 21459.7.diff

wp-includes/ms-blogs.php

@@ -476 +476 @@
         $prev_blog_id = $GLOBALS['blog_id'];
         $GLOBALS['blog_id'] = $new_blog;
 
-        if ( did_action( 'init' ) ) {
-                $wp_roles->reinit();
-                $current_user = wp_get_current_user();
-                $current_user->for_blog( $new_blog );
-        }
-
         if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
                 wp_cache_switch_to_blog( $new_blog );
         } else {
@@ -503 +497 @@
                 }
         }
 
+        if ( did_action( 'init' ) ) {
+                $wp_roles->reinit();
+                $current_user = wp_get_current_user();
+                $current_user->for_blog( $new_blog );
+        }
+
         do_action( 'switch_blog', $new_blog, $prev_blog_id );
         $GLOBALS['switched'] = true;
 
@@ -537 +537 @@
         $GLOBALS['blog_id'] = $blog;
         $GLOBALS['table_prefix'] = $wpdb->prefix;
 
-        if ( did_action( 'init' ) ) {
-                $wp_roles->reinit();
-                $current_user = wp_get_current_user();
-                $current_user->for_blog( $blog );
-        }
-
         if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
                 wp_cache_switch_to_blog( $blog );
         } else {
@@ -564 +558 @@
                 }
         }
 
+        if ( did_action( 'init' ) ) {
+                $wp_roles->reinit();
+                $current_user = wp_get_current_user();
+                $current_user->for_blog( $blog );
+        }
+
         do_action( 'switch_blog', $blog, $prev_blog_id );
 
         // If we still have items in the switched stack, consider ourselves still 'switched'