X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8a06f4f9392d1ac373442f82ee40428a3cb81395..449d082fcc4873c1f7d363a0d9f7409be7f6e77d:/wp-admin/users.php
diff --git a/wp-admin/users.php b/wp-admin/users.php
index f032e413..61fd687d 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -1,5 +1,15 @@
';
} else {
$redirect = 'users.php';
+ $referer = '';
}
-switch ($action) {
+switch ($doaction) {
case 'promote':
check_admin_referer('bulk-users');
@@ -105,7 +115,7 @@ case 'delete':
check_admin_referer('bulk-users');
- if ( empty($_REQUEST['users']) ) {
+ if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
wp_redirect($redirect);
exit();
}
@@ -113,7 +123,10 @@ case 'delete':
if ( !current_user_can('delete_users') )
$errors = new WP_Error('edit_users', __('You can’t delete users.'));
- $userids = $_REQUEST['users'];
+ if ( empty($_REQUEST['users']) )
+ $userids = array(intval($_REQUEST['user']));
+ else
+ $userids = $_REQUEST['users'];
include ('admin-header.php');
?>
@@ -122,12 +135,14 @@ case 'delete':
+
ID ) {
echo "- " . sprintf(__('ID #%1s: %2s The current user will not be deleted.'), $id, $user->user_login) . "
\n";
@@ -163,23 +178,6 @@ case 'delete':
break;
-case 'adduser':
- check_admin_referer('add-user');
-
- if ( ! current_user_can('create_users') )
- wp_die(__('You can’t create users.'));
-
- $user_id = add_user();
- $update = 'add';
- if ( is_wp_error( $user_id ) )
- $add_user_errors = $user_id;
- else {
- $new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true));
- $redirect = add_query_arg( array('usersearch' => urlencode($new_user_login), 'update' => $update), $redirect );
- wp_redirect( $redirect . '#user-' . $user_id );
- die();
- }
-
default:
if ( !empty($_GET['_wp_http_referer']) ) {
@@ -188,72 +186,72 @@ default:
}
wp_enqueue_script('admin-users');
- wp_enqueue_script('admin-forms');
include('admin-header.php');
+ $usersearch = isset($_GET['usersearch']) ? $_GET['usersearch'] : null;
+ $userspage = isset($_GET['userspage']) ? $_GET['userspage'] : null;
+ $role = isset($_GET['role']) ? $_GET['role'] : null;
+
// Query the users
- $wp_user_search = new WP_User_Search($_GET['usersearch'], $_GET['userspage'], $_GET['role']);
+ $wp_user_search = new WP_User_Search($usersearch, $userspage, $role);
+ $messages = array();
if ( isset($_GET['update']) ) :
switch($_GET['update']) {
case 'del':
case 'del_many':
- ?>
-
-
- ' . sprintf(__ngettext('%s user deleted', '%s users deleted', $delete_count), $delete_count) . '
';
break;
case 'add':
- ?>
-
- ' . __('New user created.') . '
';
break;
case 'promote':
- ?>
-
- ' . __('Changed roles.') . '
';
break;
case 'err_admin_role':
- ?>
-
-
- ' . __("The current user's role must have user editing capabilities.") . '
';
+ $messages[] = '' . __('Other user roles have been changed.') . '
';
break;
case 'err_admin_del':
- ?>
-
-
- ' . __("You can't delete the current user.") . '
';
+ $messages[] = '' . __('Other users have been deleted.') . '
';
break;
}
endif; ?>
-
+
get_error_messages() as $message )
- echo "- $message
";
+ foreach ( $errors->get_error_messages() as $err )
+ echo "- $err
\n";
?>
-
+
-