Changeset 17440

Timestamp:

02/10/2011 08:38:04 PM (16 years ago)

Author:

ryan

Message:

Disallow and hide user removal (as opposed to deletion) for single site installs. Removal is a multisite concept. Props nacin. fixes #16501 for 3.1

Location:

branches/3.1/wp-admin

Files:

• includes/class-wp-users-list-table.php (modified) (1 diff)
• users.php (modified) (3 diffs)

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

@@ -122 +122 @@
                 $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;

branches/3.1/wp-admin/users.php

@@ -201 +201 @@
         check_admin_referer('remove-users');
 
+        if ( ! is_multisite() )
+                wp_die( __( 'You can’t remove users.' ) );
+
         if ( empty($_REQUEST['users']) ) {
                 wp_redirect($redirect);
@@ -206 +209 @@
         }
 
-        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']) ) {