Ticket #19684: 19684.patch

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;
+                if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $_REQUEST['new_role'] ]->has_cap('promote_users') ) {
+                        if ( ! ( is_multisite() && is_super_admin() ) ) {
+                                $update = 'err_admin_role';
+                                continue;
+                        }
                 }
 
                 // If the user doesn't already belong to the blog, bail.