vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2025-10-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Login and Registration: Revert [55358] and [55360].

Browse Source 
This reverts the changes implemented in [55358] and [55360].

Changeset [55358] was committed to prevent login name collision when one user registers with the email address `user@example.com` and a second user tries to register with the username `user@example.com`. However, it also introduced a potential backward compatibility issues for plugins that use `wp_update_user()`. When updating an existing user, it throws an `existing_user_email_as_login` error if the email address is also used for the user login, due to the code introduced in [55358].

This changeset removes the new scenario added in [55358] and [55360], restoring the `wp_insert_user()` function back to its previous state.

Props polevaultweb, audrasjb, costdev, peterwilsoncc, hellofromTonya, SergeyBiryukov, azaozz.
See #57967, #57394.


git-svn-id: https://develop.svn.wordpress.org/trunk@55584 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jb Audras 2023-03-23 13:52:25 +00:00
parent 77883f97fc
commit dfc078d19d
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wp-includes/user.php
View File

@ -2123,16 +2123,10 @@ function wp_insert_user( $userdata ) {
return new WP_Error( 'user_login_too_long', __( 'Username may not be longer than 60 characters.' ) );
}
// Username must be unique.
if ( ! $update && username_exists( $user_login ) ) {
return new WP_Error( 'existing_user_login', __( 'Sorry, that username already exists!' ) );
}
// Username must not match an existing user email.
if ( email_exists( $user_login ) ) {
return new WP_Error( 'existing_user_email_as_login', __( 'Sorry, that username is not available.' ) );
}
/**
* Filters the list of disallowed usernames.
*
@ -3346,8 +3340,6 @@ function register_new_user( $user_login, $user_email ) {
$sanitized_user_login = '';
} elseif ( username_exists( $sanitized_user_login ) ) {
$errors->add( 'username_exists', __( '<strong>Error:</strong> This username is already registered. Please choose another one.' ) );
} elseif ( email_exists( $sanitized_user_login ) ) {
$errors->add( 'username_exists_as_email', __( '<strong>Error:</strong> This username is not available. Please choose another one.' ) );
} else {
/** This filter is documented in wp-includes/user.php */
$illegal_user_logins = (array) apply_filters( 'illegal_user_logins', array() );

18
tests/phpunit/tests/user.php
View File

@ -897,24 +897,6 @@ class Tests_User extends WP_UnitTestCase {
$this->assertSame( 'user_login_too_long', $u->get_error_code() );
}
/**
* @ticket 57394
*/
public function test_wp_insert_user_should_reject_user_login_that_matches_existing_user_email() {
$existing_email = get_option( 'admin_email' );
$user_id = wp_insert_user(
array(
'user_login' => $existing_email,
'user_email' => 'whatever@example.com',
'user_pass' => 'whatever',
'user_nicename' => 'whatever',
)
);
$this->assertWPError( $user_id );
$this->assertSame( 'existing_user_email_as_login', $user_id->get_error_code() );
}
/**
* @ticket 33793
*/