Changeset 14032

Timestamp:

04/07/2010 03:28:10 PM (15 years ago)

Author:

ryan

Message:

User is_super_admin(). Props ocean90. fixes #12888

Location:

trunk

Files:

• wp-admin/includes/user.php (modified) (1 diff)
• wp-includes/ms-deprecated.php (modified) (1 diff)

trunk/wp-admin/includes/user.php

@@ -80 +80 @@
         // Don't let anyone with 'edit_users' (admins) edit their own role to something without it.
         // Multisite super admins can freely edit their blog roles -- they possess all caps.
-        if ( ( is_multisite() && is_site_admin() ) || $user_id != $current_user->id || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) )
+        if ( ( is_multisite() && is_super_admin() ) || $user_id != $current_user->id || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) )
             $user->role = $new_role;
 

trunk/wp-includes/ms-deprecated.php

@@ -102 +102 @@
  */
 function get_current_user_id() {
-    _deprecated_function( __FUNCTION__, '3.0', '$GLOBALS\'current_user\']->ID' );
+    _deprecated_function( __FUNCTION__, '3.0', '$GLOBALS[\'current_user\']->ID' );
     return $GLOBALS['current_user']->ID;
 }