Changeset 12611

Timestamp:

01/06/2010 11:27:22 PM (15 years ago)

Author:

ryan

Message:

Introduce is_super_admin(). see #11644.

Location:

trunk/wp-includes

Files:

• capabilities.php (modified) (1 diff)
• ms-functions.php (modified) (1 diff)

trunk/wp-includes/capabilities.php

@@ -1063 +1063 @@
 }
 
+/**
+ * Determine if user is a site admin.
+ *
+ * @since 3.0
+ *
+ * @param int $user_id (Optional) The ID of a user. Defaults to the current user.
+ * @return bool True if the user is a site admin.
+ */
+function is_super_admin( $user_id = false ) {
+    global $current_user;
+
+    if ( !$current_user && !$user_id )
+        return false;
+
+    if ( !$user_id )
+        $user_id = $current_user->id;
+
+    if ( !$user_id )
+        return false;
+
+    $user = new WP_User($user_id);
+
+    $site_admins = get_site_option( 'site_admins', array('admin') );
+    if ( is_array( $site_admins ) && in_array( $user->user_login, $site_admins ) )
+        return true;
+
+    return false;
+}
+
 ?>

trunk/wp-includes/ms-functions.php

@@ -184 +184 @@
 }
 
-function is_site_admin( $user_login = false ) {
-    global $current_user;
-
-    if ( !$current_user && !$user_login )
-        return false;
-
-    if ( $user_login ) {
-        $user_login = sanitize_user( $user_login );
-    } elseif( isset( $current_user->user_login ) ) {
-        $user_login = $current_user->user_login;
+/**
+ * Determine if user is a site admin.
+ *
+ * @deprecated Use {@link is_keymaster()}
+ * 
+ */
+function is_site_admin( $user_login = '' ) {
+    // This function must reside in a file included only if is_multsite() since many plugins
+    // test for its existence to determine if multisite is enabled.
+
+    if ( empty($user_login) ) {
+        $user_id = get_current_user_id();
+        if ( !$user_id )
+            return false;
     } else {
-        return false;
-    }
-
-    $site_admins = get_site_option( 'site_admins', array('admin') );
-    if( is_array( $site_admins ) && in_array( $user_login, $site_admins ) )
-        return true;
-
-    return false;
+        $user = new WP_User(null, $user_login);
+        if ( empty($user->id) )
+            return false;
+        $user_id = $user->id;
+    }
+
+    return is_super_admin($user_id);
 }