Changeset 39588 for trunk/src/wp-admin/users.php

Timestamp:

12/12/2016 09:41:44 PM (10 years ago)

Author:

flixos90

Message:

Multisite: Handle capability check for removing oneself via map_meta_cap().

Site administrators should not be able to remove themselves from a site. This moves the enforcement of this rule from wp-admin/users.php to remove_user_from_blog() via the remove_user capability, which furthermore allows us to get rid of two additional clauses and their is_super_admin() checks in wp-admin/users.php. A unit test for the new behavior has been added.

Fixes #39063. See #37616.

File:

• trunk/src/wp-admin/users.php (modified) (2 diffs)

trunk/src/wp-admin/users.php

@@ -322 +322 @@
         foreach ( $userids as $id ) {
                 $id = (int) $id;
-                if ( $id == $current_user->ID && !is_super_admin() ) {
-                        $update = 'err_admin_remove';
-                        continue;
-                }
                 if ( !current_user_can('remove_user', $id) ) {
                         $update = 'err_admin_remove';
@@ -378 +374 @@
                 $id = (int) $id;
                 $user = get_userdata( $id );
-                if ( $id == $current_user->ID && !is_super_admin() ) {
-                        /* translators: 1: user id, 2: user login */
-                        echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be removed.</strong>'), $id, $user->user_login) . "</li>\n";
-                } elseif ( !current_user_can('remove_user', $id) ) {
+                if ( ! current_user_can( 'remove_user', $id ) ) {
                         /* translators: 1: user id, 2: user login */
                         echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>Sorry, you are not allowed to remove this user.</strong>'), $id, $user->user_login) . "</li>\n";