Changes from branches/3.0/wp-includes/capabilities.php at r16631 to tags/3.0.1/wp-includes/capabilities.php at r15479

File:

• tags/3.0.1/wp-includes/capabilities.php (modified) (3 diffs)

tags/3.0.1/wp-includes/capabilities.php

@@ -799 +799 @@
         case 'remove_user':
                 $caps[] = 'remove_users';
+                break;
+        case 'delete_user':
+                $caps[] = 'delete_users';
                 break;
         case 'promote_user':
@@ -1026 +1029 @@
         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 {
-                        if ( 'delete_user' == $cap )
-                                $cap = 'delete_users';
+                else
                         $caps[] = $cap;
-                }
                 break;
         case 'create_users':
@@ -1080 +1080 @@
         $current_user = wp_get_current_user();
 
+    if ( is_multisite() && is_super_admin() )
+                return true;
+
         if ( empty( $current_user ) )
                 return false;