Changeset 14176 for trunk/wp-admin/includes/template.php

Timestamp:

04/21/2010 05:43:53 PM (15 years ago)

Author:

ryan

Message:

Separate user deletion and removal. Add promote_users cap so that multisite Admins (not supes) can promote. see #13074

File:

• trunk/wp-admin/includes/template.php (modified) (1 diff)

trunk/wp-admin/includes/template.php

@@ -1824 +1824 @@
 
         // Set up the hover actions for this user
-        $del_cap_type = 'remove';
-        if ( !is_multisite() && current_user_can('delete_users') )
-            $del_cap_type = 'delete';
-
         $actions = array();
         $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-        if ( $current_user->ID != $user_object->ID && current_user_can( $del_cap_type . '_user', $user_object->ID ) )
+        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>";
+        if ( is_multisite() && $current_user->ID != $user_object->ID && current_user_can('remove_user', $user_object->ID) )
+            $actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=remove&amp;user=$user_object->ID", 'bulk-users') . "'>" . __('Remove') . "</a>";
         $actions = apply_filters('user_row_actions', $actions, $user_object);
         $action_count = count($actions);