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

2
wp-admin/network/site-users.php
View File

@@ -143,7 +143,7 @@ if ( $action ) {
if ( !is_user_member_of_blog( $user_id ) )
wp_die(__('Cheatin’ uh?'));
$user = new WP_User( $user_id );
$user = get_userdata( $user_id );
$user->set_role( $_REQUEST['new_role'] );
}
} else {

6
wp-admin/network/users.php
View File

@@ -34,7 +34,7 @@ function confirm_delete_users( $users ) {
foreach ( ( $allusers = (array) $_POST['allusers'] ) as $key => $val ) {
if ( $val != '' && $val != '0' ) {
$delete_user = new WP_User( $val );
$delete_user = get_userdata( $val );
if ( ! current_user_can( 'delete_user', $delete_user->ID ) )
wp_die( sprintf( __( 'Warning! User %s cannot be deleted.' ), $delete_user->user_login ) );
@@ -139,8 +139,8 @@ if ( isset( $_GET['action'] ) ) {
break;
case 'spam':
$user = new WP_User( $val );
if ( in_array( $user->user_login, get_super_admins() ) )
$user = get_userdata( $val );
if ( is_super_admin( $user->ID ) )
wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user->user_login ) ) );
$userfunction = 'all_spam';