From dfc078d19db375d6725fed3761b69a330516900b Mon Sep 17 00:00:00 2001 From: Jb Audras Date: Thu, 23 Mar 2023 13:52:25 +0000 Subject: [PATCH] Login and Registration: Revert [55358] and [55360]. 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 --- src/wp-includes/user.php | 8 -------- tests/phpunit/tests/user.php | 18 ------------------ 2 files changed, 26 deletions(-) diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php index ba63576fd6..ee7c87f8a6 100644 --- a/src/wp-includes/user.php +++ b/src/wp-includes/user.php @@ -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', __( 'Error: This username is already registered. Please choose another one.' ) ); - } elseif ( email_exists( $sanitized_user_login ) ) { - $errors->add( 'username_exists_as_email', __( 'Error: 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() ); diff --git a/tests/phpunit/tests/user.php b/tests/phpunit/tests/user.php index 24496c7895..7157a00cfa 100644 --- a/tests/phpunit/tests/user.php +++ b/tests/phpunit/tests/user.php @@ -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 */