X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/03f2fa83c13c1b532284205fa7efcab9b8b2c41f..febc815b2c9d85be5717da9e8d164bd2daa97e31:/wp-admin/users.php
diff --git a/wp-admin/users.php b/wp-admin/users.php
index cdf0d8b3..194ced94 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -13,7 +13,7 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! current_user_can( 'list_users' ) ) {
wp_die(
'
' . __( 'Cheatin’ uh?' ) . ' ' .
- '' . __( 'You are not allowed to browse users.' ) . '
',
+ '' . __( 'Sorry, you are not allowed to browse users.' ) . '
',
403
);
}
@@ -39,7 +39,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 above the users list 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.') . ' ' .
' '
) );
@@ -211,13 +211,14 @@ case 'delete':
else
$userids = array_map( 'intval', (array) $_REQUEST['users'] );
- $users_posts = new WP_Query( array(
- 'post_type' => 'any',
- 'author' => implode( ',', $userids ),
- 'posts_per_page' => 1
- ) );
+ $users_have_content = false;
+ if ( $wpdb->get_var( "SELECT ID FROM {$wpdb->posts} WHERE post_author IN( " . implode( ',', $userids ) . " ) LIMIT 1" ) ) {
+ $users_have_content = true;
+ } elseif ( $wpdb->get_var( "SELECT link_id FROM {$wpdb->links} WHERE link_owner IN( " . implode( ',', $userids ) . " ) LIMIT 1" ) ) {
+ $users_have_content = true;
+ }
- if ( $users_posts->have_posts() ) {
+ if ( $users_have_content ) {
add_action( 'admin_head', 'delete_users_add_js' );
}
@@ -247,8 +248,10 @@ case 'delete':
foreach ( $userids as $id ) {
$user = get_userdata( $id );
if ( $id == $current_user->ID ) {
+ /* translators: 1: user id, 2: user login */
echo "" . sprintf(__('ID #%1$s: %2$s The current user will not be deleted. '), $id, $user->user_login) . " \n";
} else {
+ /* translators: 1: user id, 2: user login */
echo " " . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . " \n";
$go_delete++;
}
@@ -257,7 +260,7 @@ case 'delete':
have_posts() ) : ?>
+ if ( ! $users_have_content ) : ?>
@@ -270,17 +273,23 @@ case 'delete':
' . __( 'Attribute all content to:' ) . ' ';
- wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?>
+ wp_dropdown_users( array(
+ 'name' => 'reassign_user',
+ 'exclude' => array_diff( $userids, array( $current_user->ID ) ),
+ 'show' => 'display_name_with_login',
+ ) ); ?>
@@ -369,10 +378,13 @@ case 'remove':
$id = (int) $id;
$user = get_userdata( $id );
if ( $id == $current_user->ID && !is_super_admin() ) {
+ /* translators: 1: user id, 2: user login */
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 #%1$s: %2$s You don\'t have permission to remove this user. '), $id, $user->user_login) . " \n";
+ /* translators: 1: user id, 2: user login */
+ echo "" . sprintf(__('ID #%1$s: %2$s You don’t have permission to remove this user. '), $id, $user->user_login) . " \n";
} else {
+ /* translators: 1: user id, 2: user login */
echo " " . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . " \n";
$go_remove = true;
}
@@ -422,6 +434,7 @@ default:
break;
case 'add':
if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) {
+ /* translators: %s: edit page url */
$messages[] = '' . sprintf( __( 'New user created. Edit user ' ),
esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
self_admin_url( 'user-edit.php?user_id=' . $user_id ) ) ) ) . '
';
@@ -471,13 +484,16 @@ if ( ! empty($messages) ) {
-
+
-
+
' . __('Search results for “%s”') . '', esc_html( $usersearch ) ); ?>
+if ( strlen( $usersearch ) ) {
+ /* translators: %s: search keywords */
+ printf( '' . __( 'Search results for “%s”' ) . ' ', esc_html( $usersearch ) );
+}
+?>
views(); ?>