Changeset 31963 for trunk/src/wp-includes/user.php

Timestamp:

04/01/2015 06:22:16 PM (9 years ago)

Author:

wonderboymusic

Message:

When updating the email address for an existing user, make sure the email address is not already in use.

Adds unit tests.

Props rittesh.patel, DrewAPicture.
Fixes #30647.

File:

• trunk/src/wp-includes/user.php (modified) (1 diff)

trunk/src/wp-includes/user.php

@@ -1895 +1895 @@
     $user_email = apply_filters( 'pre_user_email', $raw_user_email );
 
-    if ( ! $update && ! defined( 'WP_IMPORTING' ) && email_exists( $user_email ) ) {
+    /*
+     * If there is no update, just check for `email_exists`. If there is an update,
+     * check if current email and new email are the same, or not, and check `email_exists`
+     * accordingly.
+     */
+    if ( ( ! $update || ( ! empty( $old_user_data ) && $user_email !== $old_user_data->user_email ) )
+        && ! defined( 'WP_IMPORTING' )
+        && email_exists( $user_email )
+    ) {
         return new WP_Error( 'existing_user_email', __( 'Sorry, that email address is already used!' ) );
     }