Changeset 15561

Timestamp:

09/04/2010 12:24:43 PM (14 years ago)

Author:

nacin

Message:

Fix the delete_user meta cap.

File:

• trunk/wp-includes/capabilities.php (modified) (2 diffs)

trunk/wp-includes/capabilities.php

@@ -799 +799 @@
     case 'remove_user':
         $caps[] = 'remove_users';
-        break;
-    case 'delete_user':
-        $caps[] = 'delete_users';
         break;
     case 'promote_user':
@@ -1029 +1026 @@
     case 'delete_users':
         // If multisite these caps are allowed only for super admins.
-        if ( is_multisite() && !is_super_admin( $user_id ) )
+        if ( is_multisite() && !is_super_admin( $user_id ) ) {
             $caps[] = 'do_not_allow';
-        else
+        } else {
+            if ( 'delete_user' == $cap )
+                $cap = 'delete_users';
             $caps[] = $cap;
+        }
         break;
     case 'create_users':