WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
wpmuguru 2010-02-21 00:19:05 +00:00
parent e8d04df976
commit be4fb62b25
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-includes/capabilities.php
View File

@ -722,13 +722,17 @@ class WP_User {
$cap = $this->translate_level_to_cap( $cap ); $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_slice( func_get_args(), 1 );
$args = array_merge( array( $cap, $this->ID ), $args ); $args = array_merge( array( $cap, $this->ID ), $args );
$caps = call_user_func_array( 'map_meta_cap', $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 // Must have ALL requested caps
$capabilities = apply_filters( 'user_has_cap', $this->allcaps, $caps, $args ); $capabilities = apply_filters( 'user_has_cap', $this->allcaps, $caps, $args );
foreach ( (array) $caps as $cap ) { foreach ( (array) $caps as $cap ) {
@ -1027,9 +1031,6 @@ function map_meta_cap( $cap, $user_id ) {
function current_user_can( $capability ) { function current_user_can( $capability ) {
$current_user = wp_get_current_user(); $current_user = wp_get_current_user();
if ( is_multisite() && is_super_admin() )
return true;
if ( empty( $current_user ) ) if ( empty( $current_user ) )
return false; return false;