Ticket #39170: 39170.diff

src/wp-admin/user-edit.php

@@ -364 +364 @@
 </select></td></tr>
 <?php endif; //!IS_PROFILE_PAGE
 
-if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?>
+if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && ! isset( $super_admins ) ) { ?>
 <tr class="user-super-admin-wrap"><th><?php _e('Super Admin'); ?></th>
 <td>
-<?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
 <p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
-<?php else : ?>
-<p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>
-<?php endif; ?>
 </td></tr>
 <?php } ?>
 

src/wp-includes/capabilities.php

@@ -769 +769 @@
  * Revokes Super Admin privileges.
  *
  * @since 3.0.0
+ * @since 4.8.0 Super admin privileges can be revoked regardless of email address.
  *
  * @global array $super_admins
  *
@@ -795 +796 @@
         $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
 
         $user = get_userdata( $user_id );
-        if ( $user && 0 !== strcasecmp( $user->user_email, get_site_option( 'admin_email' ) ) ) {
+        if ( $user ) {
                 if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
                         unset( $super_admins[$key] );
                         update_site_option( 'site_admins', $super_admins );

tests/phpunit/tests/user/multisite.php

@@ -424 +424 @@
 
                 $wp_roles->remove_role( $role );
         }
+
+        /**
+         * @ticket 39170
+         */
+        public function test_revoke_super_admin_with_network_email() {
+                if ( isset( $GLOBALS['super_admins'] ) ) {
+                        $old_global = $GLOBALS['super_admins'];
+                        unset( $GLOBALS['super_admins'] );
+                }
+
+                $old_network_email = get_site_option( 'admin_email' );
+
+                $email_address = 'superadmin333@example.org';
+                $user_id = self::factory()->user->create( array(
+                        'user_email' => $email_address,
+                ) );
+                grant_super_admin( $user_id );
+                update_site_option( 'admin_email', $email_address );
+
+                $result = revoke_super_admin( $user_id );
+
+                update_site_option( 'admin_email', $old_network_email );
+
+                if ( isset( $old_global ) ) {
+                        $GLOBALS['super_admins'] = $old_global;
+                }
+
+                $this->assertTrue( $result );
+        }
 }
 
 endif ;