diff -r f507feede89a -r 09a1c134465b web/wp-admin/network/users.php --- a/web/wp-admin/network/users.php Wed Dec 19 12:35:13 2012 -0800 +++ b/web/wp-admin/network/users.php Wed Dec 19 17:46:52 2012 -0800 @@ -24,7 +24,7 @@ screen_icon(); ?>

-

+

$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 ) ); @@ -47,7 +47,7 @@ if ( !empty( $blogs ) ) { ?> -

%s?" ), $delete_user->user_login ); ?>

+

%s?" ), $delete_user->user_login ); ?>

$details ) { $blog_users = get_users( array( 'blog_id' => $details->userblog_id ) ); @@ -67,9 +67,9 @@
  • +
  • + ' . $user_dropdown; ?>
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';