WordPress.org

Make WordPress Core

Changeset 15480


Ignore:
Timestamp:
07/29/2010 09:58:58 PM (8 years ago)
Author:
nacin
Message:

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

Location:
trunk/wp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/capabilities.php

    r15404 r15480  
    813813    case 'edit_users':
    814814        // If multisite these caps are allowed only for super admins.
    815         if ( is_multisite() && !is_super_admin() )
     815        if ( is_multisite() && !is_super_admin( $user_id ) )
    816816            $caps[] = 'do_not_allow';
    817817        else
     
    992992        break;
    993993    case 'unfiltered_upload':
    994         if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin() )  )
     994        if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
    995995            $caps[] = $cap;
    996996        else
     
    10291029    case 'delete_users':
    10301030        // If multisite these caps are allowed only for super admins.
    1031         if ( is_multisite() && !is_super_admin() )
     1031        if ( is_multisite() && !is_super_admin( $user_id ) )
    10321032            $caps[] = 'do_not_allow';
    10331033        else
  • trunk/wp-includes/version.php

    r15275 r15480  
    1616 * @global int $wp_db_version
    1717 */
    18 $wp_db_version = 15260;
     18$wp_db_version = 15477;
    1919
    2020/**
Note: See TracChangeset for help on using the changeset viewer.