diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index 1b5381be3f..561dea1a99 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -471,15 +471,11 @@ switch ( $action ) { - + - user_email, get_site_option( 'admin_email' ) ) || ! is_super_admin( $profile_user->ID ) ) : ?> -

- -

- +

diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php index ef4c64980d..85f68985de 100644 --- a/wp-includes/capabilities.php +++ b/wp-includes/capabilities.php @@ -1252,6 +1252,7 @@ function grant_super_admin( $user_id ) { * Revokes Super Admin privileges. * * @since 3.0.0 + * @since 6.9.0 Super admin privileges can be revoked regardless of email address. * * @global array $super_admins * @@ -1278,7 +1279,7 @@ function revoke_super_admin( $user_id ) { $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 ) { $key = array_search( $user->user_login, $super_admins, true ); if ( false !== $key ) { unset( $super_admins[ $key ] ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 0c3e4a6d34..8105451851 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.9-alpha-60976'; +$wp_version = '6.9-alpha-60977'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.