X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/341dfbb66f24f5145174c373267f889c31615cc5..6c8f14c09105d0afa4c1574215c59b5021040e76:/wp-admin/users.php
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 5fefb427..6ea17657 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -33,7 +33,7 @@ get_current_screen()->add_help_tab( array(
'content' => '
' . __('You can customize the display of this screen in a number of ways:') . '
' .
'' .
'' . __('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.') . ' ' .
- '' . __('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.') . ' ' .
+ '' . __('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.') . ' ' .
'' . __('You can view all posts made by a user by clicking on the number under the Posts column.') . ' ' .
' '
) );
@@ -75,6 +75,22 @@ if ( empty($_REQUEST) ) {
$update = '';
+/**
+ * @since 3.5.0
+ * @access private
+ */
+function delete_users_add_js() { ?>
+
+current_action() ) {
/* Bulk Dropdown menu Role changes */
@@ -111,7 +127,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']);
}
@@ -131,16 +147,22 @@ case 'dodelete':
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 @@ case 'dodelete':
}
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 @@ case 'delete':
$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 @@ case 'delete':
+
+
+
-
+
@@ -302,13 +328,13 @@ 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 "" . 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;
}
}
@@ -338,6 +364,7 @@ default:
wp_redirect( add_query_arg( 'paged', $total_pages ) );
exit;
}
+
include('./admin-header.php');
$messages = array();
@@ -346,10 +373,16 @@ default:
case 'del':
case 'del_many':
$delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0;
- $messages[] = '' . sprintf(_n('%s user deleted', '%s users deleted', $delete_count), $delete_count) . '
';
+ $messages[] = '' . sprintf( _n( 'User deleted.', '%s users deleted.', $delete_count ), number_format_i18n( $delete_count ) ) . '
';
break;
case 'add':
- $messages[] = '' . __('New user created.') . '
';
+ if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) {
+ $messages[] = '' . sprintf( __( 'New user created. Edit user ' ),
+ esc_url( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ),
+ self_admin_url( 'user-edit.php?user_id=' . $user_id ) ) ) ) . '
';
+ } else {
+ $messages[] = '' . __( 'New user created.' ) . '
';
+ }
break;
case 'promote':
$messages[] = '' . __('Changed roles.') . '
';