Changeset 19646 for branches/3.3

Timestamp:

01/02/2012 09:45:38 PM (13 years ago)

Author:

ryan

Message:

Only allow _multisite_ super admins to demote themselves on a site. props linuxologos, fixes #19684 for 3.3

Location:

branches/3.3

Files:

• . (modified) (1 prop)
• wp-admin/users.php (modified) (1 diff)
• wp-includes/capabilities.php (modified) (1 prop)

branches/3.3/wp-admin/users.php

@@ -101 +101 @@
         if ( ! current_user_can('promote_user', $id) )
             wp_die(__('You can’t edit that user.'));
-        // The new role of the current user must also have the promote_users cap or be a super admin
-        if ( $id == $current_user->ID && ! is_super_admin() && ! $wp_roles->role_objects[ $_REQUEST['new_role'] ]->has_cap('promote_users') ) {
-            $update = 'err_admin_role';
-            continue;
+        // The new role of the current user must also have the promote_users cap or be a multisite super admin
+        if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $_REQUEST['new_role'] ]->has_cap('promote_users')
+            && ! ( is_multisite() && is_super_admin() ) ) {
+                $update = 'err_admin_role';
+                continue;
         }