Skip to content

Users: Make user email comparison case-insensitive in wp_insert_user()/wp_update_user() #11697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wppoland wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

Users: Make user email comparison case-insensitive in wp_insert_user()/wp_update_user() #11697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
021113e
Users: Make user email comparison case-insensitive in `wp_insert_user…
wppoland Sep 13, 2026
a35eb6f
Merge branch 'trunk' into trac/52976
wppoland Sep 27, 2026
78142ac
Merge branch 'trunk' into trac/52976
wppoland Sep 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/wp-includes/user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2595,7 +2595,7 @@ function wp_insert_user( $userdata ) {
}

if ( $update ) {
if ( $user_email !== $old_user_data->user_email || $user_pass !== $old_user_data->user_pass ) {
if ( 0 !== strcasecmp( $user_email, $old_user_data->user_email ) || $user_pass !== $old_user_data->user_pass ) {
$data['user_activation_key'] = '';
}
$wpdb->update( $wpdb->users, $data, array( 'ID' => $user_id ) );
Expand Down Expand Up @@ -2811,7 +2811,7 @@ function wp_update_user( $userdata ) {
$send_password_change_email = apply_filters( 'send_password_change_email', true, $user, $userdata );
}

if ( isset( $userdata['user_email'] ) && $user['user_email'] !== $userdata['user_email'] ) {
if ( isset( $userdata['user_email'] ) && 0 !== strcasecmp( $user['user_email'], $userdata['user_email'] ) ) {
/**
* Filters whether to send the email change email.
*
Expand Down
101 changes: 101 additions & 0 deletions tests/phpunit/tests/user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2881,4 +2881,105 @@ public function test_set_password_action_on_user_update() {
$this->assertSame( $updated_password, $args[0][0], 'Invalid password in wp_set_password action.' );
$this->assertSame( $user_id, $args[0][1], 'Invalid user ID in wp_set_password action.' );
}

/**
* Changing only the case of an email should not trigger the email change notification.
*
* @ticket 52976
* @covers ::wp_update_user
*/
public function test_case_only_email_change_does_not_trigger_email_change_notification() {
$user_id = self::factory()->user->create(
array(
'user_email' => 'testcase@example.com',
)
);

$email_change_fired = false;
$callback = static function () use ( &$email_change_fired ) {
$email_change_fired = true;
return false;
};

add_filter( 'send_email_change_email', $callback );

wp_update_user(
array(
'ID' => $user_id,
'user_email' => 'TestCase@Example.COM',
)
);

remove_filter( 'send_email_change_email', $callback );

$this->assertFalse( $email_change_fired, 'Email change notification should not fire for case-only email change.' );
}

/**
* Changing to a genuinely different email should still trigger the notification.
*
* @ticket 52976
* @covers ::wp_update_user
*/
public function test_real_email_change_triggers_email_change_notification() {
$user_id = self::factory()->user->create(
array(
'user_email' => 'original@example.com',
)
);

$email_change_fired = false;
$callback = static function () use ( &$email_change_fired ) {
$email_change_fired = true;
return false;
};

add_filter( 'send_email_change_email', $callback );

wp_update_user(
array(
'ID' => $user_id,
'user_email' => 'different@example.com',
)
);

remove_filter( 'send_email_change_email', $callback );

$this->assertTrue( $email_change_fired, 'Email change notification should fire for a genuinely different email.' );
}

/**
* Changing only the case of an email should not clear the user_activation_key.
*
* Complements `test_changing_email_invalidates_password_reset_key()`, which covers the case
* where a genuinely different email clears the key.
*
* @ticket 52976
* @covers ::wp_insert_user
*/
public function test_case_only_email_change_does_not_clear_user_activation_key() {
global $wpdb;

$user_id = self::factory()->user->create(
array(
'user_email' => 'keytest@example.com',
)
);

$wpdb->update( $wpdb->users, array( 'user_activation_key' => 'key' ), array( 'ID' => $user_id ) );
clean_user_cache( $user_id );

$user = get_userdata( $user_id );
$this->assertSame( 'key', $user->user_activation_key, 'Precondition: activation key should be set.' );

wp_update_user(
array(
'ID' => $user_id,
'user_email' => 'KeyTest@Example.COM',
)
);

$user = get_userdata( $user_id );
$this->assertSame( 'key', $user->user_activation_key, 'user_activation_key should not be cleared on case-only email change.' );
}
}
Loading