X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..672d6bc6da735e745275ef7a86341dc1178da8d2:/wp-admin/users.php
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 61fd687d..758a5927 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -28,10 +28,10 @@ if ( empty($doaction) ) {
}
if ( empty($_REQUEST) ) {
- $referer = '';
+ $referer = '';
} elseif ( isset($_REQUEST['wp_http_referer']) ) {
$redirect = remove_query_arg(array('wp_http_referer', 'updated', 'delete_count'), stripslashes($_REQUEST['wp_http_referer']));
- $referer = '';
+ $referer = '';
} else {
$redirect = 'users.php';
$referer = '';
@@ -39,6 +39,7 @@ if ( empty($_REQUEST) ) {
switch ($doaction) {
+/* Bulk Dropdown menu Role changes */
case 'promote':
check_admin_referer('bulk-users');
@@ -47,8 +48,9 @@ case 'promote':
exit();
}
- if ( !current_user_can('edit_users') )
- wp_die(__('You can’t edit users.'));
+ $editable_roles = get_editable_roles();
+ if (!$editable_roles[$_REQUEST['new_role']])
+ wp_die(__('You can’t give users that role.'));
$userids = $_REQUEST['users'];
$update = 'promote';
@@ -147,7 +149,7 @@ case 'delete':
if ( $id == $current_user->ID ) {
echo "
" . sprintf(__('ID #%1s: %2s The current user will not be deleted.'), $id, $user->user_login) . "\n";
} else {
- echo "" . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "\n";
+ echo "" . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "\n";
$go_delete = true;
}
}
@@ -155,7 +157,7 @@ case 'delete':
$user_dropdown = '';
?>
@@ -168,7 +170,7 @@ case 'delete':
'.__('Attribute all posts and links to:')." $user_dropdown"; ?>
-
+
@@ -185,8 +187,6 @@ default:
exit;
}
- wp_enqueue_script('admin-users');
-
include('admin-header.php');
$usersearch = isset($_GET['usersearch']) ? $_GET['usersearch'] : null;
@@ -202,7 +202,7 @@ default:
case 'del':
case 'del_many':
$delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0;
- $messages[] = '' . sprintf(__ngettext('%s user deleted', '%s users deleted', $delete_count), $delete_count) . '
';
+ $messages[] = '' . sprintf(_n('%s user deleted', '%s users deleted', $delete_count), $delete_count) . '
';
break;
case 'add':
$messages[] = '' . __('New user created.') . '
';
@@ -211,11 +211,11 @@ default:
$messages[] = '' . __('Changed roles.') . '
';
break;
case 'err_admin_role':
- $messages[] = '' . __("The current user's role must have user editing capabilities.") . '
';
+ $messages[] = '' . __('The current user’s role must have user editing capabilities.') . '
';
$messages[] = '' . __('Other user roles have been changed.') . '
';
break;
case 'err_admin_del':
- $messages[] = '' . __("You can't delete the current user.") . '
';
+ $messages[] = '' . __('You can’t delete the current user.') . '
';
$messages[] = '' . __('Other users have been deleted.') . '
';
break;
}
@@ -239,9 +239,9 @@ if ( ! empty($messages) ) {
-
' . __('Search results for “%s”') . '', wp_specialchars( get_search_query() ) ); ?>
+' . __('Search results for “%s”') . '', esc_html( $_GET['usersearch'] ) ); ?>
@@ -264,7 +264,7 @@ unset($users_of_blog);
$current_role = false;
$class = empty($role) ? ' class="current"' : '';
-$role_links[] = "
" . sprintf( __ngettext( 'All (%s)', 'All (%s)', $total_users ), number_format_i18n( $total_users ) ) . '';
+$role_links[] = "" . sprintf( _nx( 'All (%s)', 'All (%s)', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '';
foreach ( $wp_roles->get_names() as $this_role => $name ) {
if ( !isset($avail_roles[$this_role]) )
continue;
@@ -276,8 +276,9 @@ foreach ( $wp_roles->get_names() as $this_role => $name ) {
$class = ' class="current"';
}
- $name = translate_with_context($name);
- $name = sprintf( _c('%1$s (%2$s)|user role with count'), $name, $avail_roles[$this_role] );
+ $name = translate_user_role( $name );
+ /* translators: User role name with count */
+ $name = sprintf( __('%1$s (%2$s)'), $name, $avail_roles[$this_role] );
$role_links[] = "$name";
}
echo implode( " |\n", $role_links) . '';
@@ -289,9 +290,9 @@ unset($role_links);
@@ -307,9 +308,9 @@ unset($role_links);
-
-
-
+
+
+
@@ -373,7 +374,7 @@ foreach ( $wp_user_search->get_results() as $userid ) {
-
+
@@ -387,7 +388,7 @@ foreach ( $wp_user_search->get_results() as $userid ) {
'user_login', 'first_name' => 'user_firstname', 'last_name' => 'user_lastname', 'email' => 'user_email', 'url' => 'user_uri', 'role' => 'user_role') as $formpost => $var ) {
$var = 'new_' . $var;
- $$var = isset($_REQUEST[$formpost]) ? attribute_escape(stripslashes($_REQUEST[$formpost])) : '';
+ $$var = isset($_REQUEST[$formpost]) ? esc_attr(stripslashes($_REQUEST[$formpost])) : '';
}
unset($name);
?>