From be4fb62b25df41efa16af463c7b03e41c2454b62 Mon Sep 17 00:00:00 2001 From: wpmuguru Date: Sun, 21 Feb 2010 00:19:05 +0000 Subject: [PATCH] use map_meta_cap for multisite superadmins, props dd32, fixes #12109 git-svn-id: http://svn.automattic.com/wordpress/trunk@13270 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/capabilities.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php index 03e903571..b09838028 100644 --- a/wp-includes/capabilities.php +++ b/wp-includes/capabilities.php @@ -722,13 +722,17 @@ class WP_User { $cap = $this->translate_level_to_cap( $cap ); } - // 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 ); foreach ( (array) $caps as $cap ) { @@ -1027,9 +1031,6 @@ function map_meta_cap( $cap, $user_id ) { function current_user_can( $capability ) { $current_user = wp_get_current_user(); - if ( is_multisite() && is_super_admin() ) - return true; - if ( empty( $current_user ) ) return false;