diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-07-06 15:20:20 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-07-06 15:20:20 +0000 |
| commit | 2c922569f544c74d172dce8cd88642ecb3e908b5 (patch) | |
| tree | 1ad69ca97037b63e100d4ef1a81d5375e809ec9a /wp-admin/users.php | |
| parent | 060cd52b46a74866030b6c5da05a0f5600ee13cf (diff) | |
| download | wordpress-mu-2c922569f544c74d172dce8cd88642ecb3e908b5.tar.gz wordpress-mu-2c922569f544c74d172dce8cd88642ecb3e908b5.tar.xz wordpress-mu-2c922569f544c74d172dce8cd88642ecb3e908b5.zip | |
Check if users is a site_admin befoer checking if they're a member of current blog
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@641 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/users.php')
| -rw-r--r-- | wp-admin/users.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wp-admin/users.php b/wp-admin/users.php index 854449c..f99a2f8 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -345,7 +345,8 @@ case 'addexistinguser': /* checking that username has been typed */ if ( !empty($new_user_email) ) { if ( $user_id = email_exists( $new_user_email ) ) { - if ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) { + $username = $wpdb->get_var( "SELECT user_login FROM {$wpdb->users} WHERE ID='$user_id'" ); + if( ($username != null && is_site_admin( $username ) == false ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) { $location = 'users.php?update=add_existing'; } else { add_user_to_blog('', $user_id, $_POST[ 'new_role' ]); |