Changeset 17380

Timestamp:

02/03/2011 12:17:35 AM (14 years ago)

Author:

markjaquith

Message:

restore_current_blog() in add_user_to_blog() and remove_user_from_blog() before early return, to avoid being stuck in a switched state. props mdawaffe. fixes #16444 for trunk.

File:

• branches/3.1/wp-includes/ms-functions.php (modified) (2 diffs)

branches/3.1/wp-includes/ms-functions.php

@@ -210 +210 @@
     $user = new WP_User($user_id);
 
-    if ( empty( $user->ID ) )
+    if ( empty( $user->ID ) ) {
+        restore_current_blog();
         return new WP_Error('user_does_not_exist', __('That user does not exist.'));
+    }
 
     if ( !get_user_meta($user_id, 'primary_blog', true) ) {
@@ -270 +272 @@
     // wp_revoke_user($user_id);
     $user = new WP_User($user_id);
-    if ( empty( $user->ID ) )
+    if ( empty( $user->ID ) ) {
+        restore_current_blog();
         return new WP_Error('user_does_not_exist', __('That user does not exist.'));
+    }
 
     $user->remove_all_caps();