WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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. 

git-svn-id: http://svn.automattic.com/wordpress/branches/3.1@17380 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2011-02-03 00:17:35 +00:00
parent dc3a5b3c8c
commit a815c789d7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/ms-functions.php
View File

@ -209,8 +209,10 @@ function add_user_to_blog( $blog_id, $user_id, $role ) {
$user = new WP_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.')); return new WP_Error('user_does_not_exist', __('That user does not exist.'));
}
if ( !get_user_meta($user_id, 'primary_blog', true) ) { if ( !get_user_meta($user_id, 'primary_blog', true) ) {
update_user_meta($user_id, 'primary_blog', $blog_id); update_user_meta($user_id, 'primary_blog', $blog_id);
@ -269,8 +271,10 @@ function remove_user_from_blog($user_id, $blog_id = '', $reassign = '') {
// wp_revoke_user($user_id); // wp_revoke_user($user_id);
$user = new WP_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.')); return new WP_Error('user_does_not_exist', __('That user does not exist.'));
}
$user->remove_all_caps(); $user->remove_all_caps();