Changeset 55584

Timestamp:

03/23/2023 01:52:25 PM (3 years ago)

Author:

audrasjb

Message:

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.

Location:

trunk

Files:

• src/wp-includes/user.php (modified) (2 diffs)
• tests/phpunit/tests/user.php (modified) (1 diff)

trunk/src/wp-includes/user.php

@@ -2124 +2124 @@
         }
 
-        // 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.' ) );
         }
 
@@ -3347 +3341 @@
         } 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 */

trunk/tests/phpunit/tests/user.php

@@ -899 +899 @@
 
         /**
-         * @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
          */