Changeset 13270 for trunk/wp-includes/capabilities.php

Timestamp:

02/21/2010 12:19:05 AM (15 years ago)

Author:

wpmuguru

Message:

use map_meta_cap for multisite superadmins, props dd32, fixes #12109

File:

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

trunk/wp-includes/capabilities.php

@@ -723 +723 @@
         }
 
-        // Multisite super admin has all caps by definition.
-        if ( is_multisite() && is_super_admin() )
-            return true;
-
         $args = array_slice( func_get_args(), 1 );
         $args = array_merge( array( $cap, $this->ID ), $args );
         $caps = call_user_func_array( 'map_meta_cap', $args );
+
+        // Multisite super admin has all caps by definition, Unless specifically denied.
+        if ( is_multisite() && is_super_admin() ) {
+            if ( in_array('do_not_allow', $caps) )
+                return false;
+            return true;
+        }
+
         // Must have ALL requested caps
         $capabilities = apply_filters( 'user_has_cap', $this->allcaps, $caps, $args );
@@ -1028 +1032 @@
     $current_user = wp_get_current_user();
 
-    if ( is_multisite() && is_super_admin() )
-        return true;
-
     if ( empty( $current_user ) )
         return false;