Ticket #16501: 16501.3.diff

wp-admin/users.php

@@ -200 +200 @@
 case 'doremove':
         check_admin_referer('remove-users');
 
+        if ( ! is_multisite() )
+                wp_die( __( 'You can’t remove users.' ) );
+
         if ( empty($_REQUEST['users']) ) {
                 wp_redirect($redirect);
                 exit;
         }
 
-        if ( !current_user_can('remove_users')  )
-                die(__('You can’t remove users.'));
+        if ( ! current_user_can( 'remove_users' ) )
+                wp_die( __( 'You can’t remove users.' ) );
 
         $userids = $_REQUEST['users'];
 
@@ -234 +237 @@
 
         check_admin_referer('bulk-users');
 
+        if ( ! is_multisite() )
+                wp_die( __( 'You can’t remove users.' ) );
+
         if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
                 wp_redirect($redirect);
                 exit();

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

@@ -121 +121 @@
         function get_bulk_actions() {
                 $actions = array();
 
-                if ( !is_multisite() && current_user_can( 'delete_users' ) )
-                        $actions['delete'] = __( 'Delete' );
-                else
-                        $actions['remove'] = __( 'Remove' );
+                if ( is_multisite() ) {
+                        if ( current_user_can( 'remove_users' ) )
+                                $actions['remove'] = __( 'Remove' );
+                } else {
+                        if ( current_user_can( 'delete_users' ) )
+                                $actions['delete'] = __( 'Delete' );
+                }
 
                 return $actions;
         }