Changeset 14206 for trunk/wp-admin/includes/ms.php

Timestamp:

04/23/2010 08:34:03 PM (16 years ago)

Author:

ryan

Message:

Introduce get_super_admins(). Allow hard-coding a global super_admins array and bypassing site options. fixes #12815

File:

• trunk/wp-admin/includes/ms.php (modified) (3 diffs)

trunk/wp-admin/includes/ms.php

@@ -188 +188 @@
     <?php
         wp_nonce_field( 'ms-users-delete' );
-        $site_admins = get_site_option( 'site_admins', array( 'admin' ) );
+        $site_admins = get_super_admins();
         $admin_out = "<option value='$current_user->ID'>$current_user->user_login</option>";
 
@@ -812 +812 @@
  */
 function grant_super_admin( $user_id ) {
+        global $super_admins;
+
+        // If global super_admins override is defined, there is nothing to do here.
+        if ( isset($super_admins) )
+                return false;
+
         do_action( 'grant_super_admin', $user_id );
 
+        // Directly fetch site_admins instead of using get_super_admins()
         $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
 
@@ -833 +840 @@
  */
 function revoke_super_admin( $user_id ) {
+        global $super_admins;
+
+        // If global super_admins override is defined, there is nothing to do here.
+        if ( isset($super_admins) )
+                return false;
+
         do_action( 'revoke_super_admin', $user_id );
 
+        // Directly fetch site_admins instead of using get_super_admins()
         $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+
         $user = new WP_User( $user_id );
         if ( $user->user_email != get_site_option( 'admin_email' ) ) {