Changeset 14043

Timestamp:

04/09/2010 08:26:16 AM (17 years ago)

Author:

nacin

Message:

More grant/revoke super admin improvements. fixes #12933.

Location:

trunk/wp-admin

Files:

• includes/ms.php (modified) (2 diffs)
• user-edit.php (modified) (1 diff)

trunk/wp-admin/includes/ms.php

@@ -819 +819 @@
                 update_site_option( 'site_admins' , $super_admins );
                 do_action( 'granted_super_admin', $user_id );
-        }
+                return true;
+        }
+        return false;
 }
 
@@ -831 +833 @@
         do_action( 'revoke_super_admin', $user_id );
 
-        $admin_email = get_site_option( 'admin_email' );
         $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
-
         $user = new WP_User( $user_id );
-        if ( $user->user_email != $admin_email ) {
-                foreach ( $super_admins as $key => $username ) {
-                        if ( $username == $user->user_login ) {
-                                unset( $super_admins[$key] );
-                                update_site_option( 'site_admins' , $super_admins );
-                                do_action( 'revoked_super_admin', $user_id );
-                                break;
-                        }
-                }
-        }
+        if ( $user->user_email != get_site_option( 'admin_email' ) ) {
+                if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
+                        unset( $super_admins[$key] );
+                        update_site_option( 'site_admins', $super_admins );
+                        do_action( 'revoked_super_admin', $user_id );
+                        return true;
+                }
+        }
+        return false;
 }
 ?>

trunk/wp-admin/user-edit.php

@@ -122 +122 @@
                 delete_user_meta( $user_id, $blog_prefix . 'capabilities' );
 
-        if ( is_multisite() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) )
+        if ( is_multisite() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) )
                 empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id );
 }