IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move most instances of new WP_User to get_userdata(). see #21120.

Browse Source 
git-svn-id: http://core.svn.wordpress.org/trunk@21413 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin
2012-08-03 01:06:05 +00:00
parent 3a0841fee7
commit 7127ed1197
16 changed files with 56 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/users.php
View File

@@ -111,7 +111,7 @@ case 'promote':
if ( is_multisite() && !is_user_member_of_blog( $id ) )
wp_die(__('Cheatin’ uh?'));
$user = new WP_User($id);
$user = get_userdata( $id );
$user->set_role($_REQUEST['new_role']);
}
@@ -201,7 +201,7 @@ case 'delete':
$go_delete = 0;
foreach ( $userids as $id ) {
$id = (int) $id;
$user = new WP_User($id);
$user = get_userdata( $id );
if ( $id == $current_user->ID ) {
echo "<li>" . sprintf(__('ID #%1s: %2s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
} else {
@@ -302,7 +302,7 @@ case 'remove':
$go_remove = false;
foreach ( $userids as $id ) {
$id = (int) $id;
$user = new WP_User($id);
$user = get_userdata( $id );
if ( $id == $current_user->ID && !is_super_admin() ) {
echo "<li>" . sprintf(__('ID #%1s: %2s <strong>The current user will not be removed.</strong>'), $id, $user->user_login) . "</li>\n";
} elseif ( !current_user_can('remove_user', $id) ) {