Changeset 22087

Timestamp:

10/01/2012 02:25:31 PM (12 years ago)

Author:

ryan

Message:

Reinit roles and the current user after switching the cache to the new blog in switch_to_blog() and restore_current_blog(). Props joostdekeijzer. fixes #21459

Location:

trunk/wp-includes

Files:

• comment.php (modified) (1 diff)
• ms-blogs.php (modified) (4 diffs)

trunk/wp-includes/comment.php

@@ -264 +264 @@
         elseif ( 'approve' == $status )
             $approved = "comment_approved = '1'";
+        elseif ( 'all' == $status )
+            $approved = "( comment_approved = '0' OR comment_approved = '1' )";
+        elseif ( 'full' == $status )
+            $approved = '0 = 0';
         elseif ( ! empty( $status ) )
             $approved = $wpdb->prepare( "comment_approved = %s", $status );

trunk/wp-includes/ms-blogs.php

@@ -477 +477 @@
     $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 );
@@ -504 +498 @@
     }
 
+    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' ) ) {
@@ -563 +557 @@
             wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
         }
+    }
+
+    if ( did_action( 'init' ) ) {
+        $wp_roles->reinit();
+        $current_user = wp_get_current_user();
+        $current_user->for_blog( $blog );
     }