Changeset 14191

Timestamp:

04/22/2010 10:53:44 PM (16 years ago)

Author:

josephscott

Message:

• don't pass user id to list_users check
• only link the username if the edit_user cap check passes

see #13074

File:

• trunk/wp-admin/includes/template.php (modified) (2 diffs)

trunk/wp-admin/includes/template.php

@@ -1813 +1813 @@
         $checkbox = '';
         // Check if the user for this row is editable
-        if ( current_user_can( 'list_users', $user_object->ID ) ) {
+        if ( current_user_can( 'list_users' ) ) {
                 // Set up the user editing link
                 // TODO: make profile/user-edit determination a separate function
@@ -1826 +1826 @@
                 $actions = array();
 
-                if ( current_user_can('edit_user',  $user_object->ID) )
+                if ( current_user_can('edit_user',  $user_object->ID) ) {
+                        $edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
                         $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
+                } else {
+                        $edit = "<strong>$user_object->user_login</strong><br />";
+                }
+
                 if ( !is_multisite() && $current_user->ID != $user_object->ID && current_user_can('delete_user', $user_object->ID) )
                         $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=delete&amp;user=$user_object->ID", 'bulk-users') . "'>" . __('Delete') . "</a>";