diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 3c1d7032c3..e39a29fc15 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -519,23 +519,25 @@ function user_row( $user_object, $style = '', $role = '' ) {
if ( strlen( $short_url ) > 35 )
$short_url = substr( $short_url, 0, 32 ).'...';
$numposts = get_usernumposts( $user_object->ID );
+ if ( current_user_can( 'edit_user', $user_object->ID ) ) {
+ $edit = add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" );
+ $edit = "$user_object->user_login";
+ } else {
+ $edit = $user_object->user_login;
+ }
$r = "
|
- |
- |
- |
+ $edit |
+ $user_object->first_name $user_object->last_name |
$email |
$short_url | ";
- $r .= "\n\t\t";
+ $r .= "\n\t\t | ";
if ( $numposts > 0 ) {
$r .= "";
- $r .= sprintf(__ngettext( 'View %s post', 'View %s posts', $numposts ), $numposts);
+ $r .= $numposts;
$r .= '';
- }
- $r .= " | \n\t\t";
- if ( current_user_can( 'edit_user', $user_object->ID ) ) {
- $edit_link = add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" );
- $r .= "".__( 'Edit' )."";
+ } else {
+ $r .= 0;
}
$r .= " | \n\t
";
return $r;
diff --git a/wp-admin/users.php b/wp-admin/users.php
index aada46a5a5..4e17ec47b6 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -292,13 +292,11 @@ foreach($roleclasses as $role => $roleclass) {
|
- |
|
|
|
|
- |
- |
+ |
-
-
' . sprintf(__('Users can
register themselves or you can manually create users here.'), get_option('siteurl').'/wp-register.php') . '';
@@ -366,10 +362,10 @@ foreach ( (array) $roleclass as $user_object ) {
?>