Ticket #18164: 18164.2.diff

wp-admin/users.php

@@ -67 +67 @@
 
                 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 promote_users caps
-                if ( $id == $current_user->ID && !$wp_roles->role_objects[$_REQUEST['new_role']]->has_cap('promote_users') ) {
+                // The new role of the current user must also have promote_users caps unless he is a network admin
+                if ( $id == $current_user->ID && ( !is_super_admin( $current_user->ID ) && !$wp_roles->role_objects[$_REQUEST['new_role']]->has_cap('promote_users') ) )  {
                         $update = 'err_admin_role';
                         continue;
                 }