Changeset 55585 for branches/6.2/src/wp-includes/user.php

Timestamp:

03/23/2023 02:17:39 PM (19 months 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.
Reviewed by hellofromTonya.
Merges [55584] to the 6.2 branch.
See #57967, #57394.

Location:

branches/6.2

Files:

• . (modified) (1 prop)
• src/wp-includes/user.php (modified) (2 diffs)

branches/6.2/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 */