diff -r f507feede89a -r 09a1c134465b web/wp-admin/users.php --- a/web/wp-admin/users.php Wed Dec 19 12:35:13 2012 -0800 +++ b/web/wp-admin/users.php Wed Dec 19 17:46:52 2012 -0800 @@ -75,6 +75,22 @@ $update = ''; +/** + * @since 3.5.0 + * @access private + */ +function delete_users_add_js() { ?> + +current_action() ) { /* Bulk Dropdown menu Role changes */ @@ -111,7 +127,7 @@ 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']); } @@ -131,16 +147,22 @@ exit(); } + $userids = array_map( 'intval', (array) $_REQUEST['users'] ); + + if ( empty( $_REQUEST['delete_option'] ) ) { + $url = self_admin_url( 'users.php?action=delete&users[]=' . implode( '&users[]=', $userids ) . '&error=true' ); + $url = str_replace( '&', '&', wp_nonce_url( $url, 'bulk-users' ) ); + wp_redirect( $url ); + exit; + } + if ( ! current_user_can( 'delete_users' ) ) wp_die(__('You can’t delete users.')); - $userids = $_REQUEST['users']; $update = 'del'; $delete_count = 0; - foreach ( (array) $userids as $id) { - $id = (int) $id; - + foreach ( $userids as $id ) { if ( ! current_user_can( 'delete_user', $id ) ) wp_die(__( 'You can’t delete that user.' ) ); @@ -150,12 +172,10 @@ } switch ( $_REQUEST['delete_option'] ) { case 'delete': - if ( current_user_can('delete_user', $id) ) - wp_delete_user($id); + wp_delete_user( $id ); break; case 'reassign': - if ( current_user_can('delete_user', $id) ) - wp_delete_user($id, $_REQUEST['reassign_user']); + wp_delete_user( $id, $_REQUEST['reassign_user'] ); break; } ++$delete_count; @@ -182,9 +202,11 @@ $errors = new WP_Error( 'edit_users', __( 'You can’t delete users.' ) ); if ( empty($_REQUEST['users']) ) - $userids = array(intval($_REQUEST['user'])); + $userids = array( intval( $_REQUEST['user'] ) ); else - $userids = (array) $_REQUEST['users']; + $userids = array_map( 'intval', (array) $_REQUEST['users'] ); + + add_action( 'admin_head', 'delete_users_add_js' ); include ('admin-header.php'); ?> @@ -195,29 +217,33 @@

+ +
+

+
+

-

+

    -
  • +
  • - '.__('Attribute all posts and links to:').''; + ' . __( 'Attribute all posts to:' ) . ' '; wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?>
@@ -302,13 +328,13 @@ $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 "
  • " . sprintf(__('ID #%1s: %2s The current user will not be removed.'), $id, $user->user_login) . "
  • \n"; + echo "
  • " . sprintf(__('ID #%1$s: %2$s The current user will not be removed.'), $id, $user->user_login) . "
  • \n"; } elseif ( !current_user_can('remove_user', $id) ) { - echo "
  • " . sprintf(__('ID #%1s: %2s You don\'t have permission to remove this user.'), $id, $user->user_login) . "
  • \n"; + echo "
  • " . sprintf(__('ID #%1$s: %2$s You don\'t have permission to remove this user.'), $id, $user->user_login) . "
  • \n"; } else { - echo "
  • " . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "
  • \n"; + echo "
  • " . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "
  • \n"; $go_remove = true; } }