golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure we're checking when looking for is_super_admin() in map_meta_cap(). Bump DB version. 

fixes #14454 for trunk.

git-svn-id: http://svn.automattic.com/wordpress/trunk@15480 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-07-29 21:58:58 +00:00
parent f243603e64
commit 2f90a8c63c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/capabilities.php
View File

@ -812,7 +812,7 @@ function map_meta_cap( $cap, $user_id ) {
// Fall through
case 'edit_users':
// If multisite these caps are allowed only for super admins.
if ( is_multisite() && !is_super_admin() )
if ( is_multisite() && !is_super_admin( $user_id ) )
$caps[] = 'do_not_allow';
else
$caps[] = 'edit_users'; // Explicit due to primitive fall through
@ -991,7 +991,7 @@ function map_meta_cap( $cap, $user_id ) {
$caps[] = 'read_private_pages';
break;
case 'unfiltered_upload':
if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin() ) )
if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) ) )
$caps[] = $cap;
else
$caps[] = 'do_not_allow';
@ -1028,7 +1028,7 @@ function map_meta_cap( $cap, $user_id ) {
case 'delete_user':
case 'delete_users':
// If multisite these caps are allowed only for super admins.
if ( is_multisite() && !is_super_admin() )
if ( is_multisite() && !is_super_admin( $user_id ) )
$caps[] = 'do_not_allow';
else
$caps[] = $cap;

2
wp-includes/version.php
View File

@ -15,7 +15,7 @@ $wp_version = '3.1-alpha';
*
* @global int $wp_db_version
*/
$wp_db_version = 15260;
$wp_db_version = 15477;
/**
* Holds the TinyMCE version