Changeset 15480

Timestamp:

07/29/2010 09:58:58 PM (16 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:

• capabilities.php (modified) (3 diffs)
• version.php (modified) (1 diff)

trunk/wp-includes/capabilities.php

@@ -813 +813 @@
         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
@@ -992 +992 @@
                 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
@@ -1029 +1029 @@
         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

trunk/wp-includes/version.php

@@ -16 +16 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 15260;
+$wp_db_version = 15477;
 
 /**