Changeset 16328

Timestamp:

11/12/2010 04:00:41 PM (15 years ago)

Author:

ryan

Message:

Check delete caps in network users admin.

File:

• trunk/wp-admin/includes/class-wp-ms-users-list-table.php (modified) (2 diffs)

trunk/wp-admin/includes/class-wp-ms-users-list-table.php

@@ -75 +75 @@
     function get_bulk_actions() {
         $actions = array();
-        $actions['delete'] = __( 'Delete' );
+        if ( current_user_can( 'delete_users' ) )
+            $actions['delete'] = __( 'Delete' );
         $actions['spam'] = _x( 'Mark as Spam', 'user' );
         $actions['notspam'] = _x( 'Not Spam', 'user' );
@@ -188 +189 @@
                                 $actions['edit'] = '<a href="' . esc_url( self_admin_url( $edit_link ) ) . '">' . __( 'Edit' ) . '</a>';
 
-                                if ( ! in_array( $user->user_login, $super_admins ) ) {
+                                if ( current_user_can( 'delete_user', $user->ID) && ! in_array( $user->user_login, $super_admins ) ) {
                                     $actions['delete'] = '<a href="' . $delete = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user->ID ) ) ) . '" class="delete">' . __( 'Delete' ) . '</a>';
                                 }