Changeset 10990

Timestamp:

04/17/2009 06:43:40 PM (17 years ago)

Author:

ryan

Message:

Enforce unique email addresses. Props Denis-de-Bernardy. fixes #9563

File:

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

trunk/wp-admin/includes/user.php

@@ -168 +168 @@
         /* checking e-mail address */
         if ( empty ( $user->user_email ) ) {
-                $errors->add( 'user_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) );
-        } else
-                if (!is_email( $user->user_email ) ) {
-                        $errors->add( 'user_email', __( "<strong>ERROR</strong>: The e-mail address isn't correct." ), array( 'form-field' => 'email' ) );
-                }
+                $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) );
+        } elseif (!is_email( $user->user_email ) ) {
+                $errors->add( 'invalid_email', __( "<strong>ERROR</strong>: The e-mail address isn't correct." ), array( 'form-field' => 'email' ) );
+        } elseif ( ( $owner_id = email_exists($user->user_email) ) && $owner_id != $user->ID ) {
+                $errors->add( 'email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'), array( 'form-field' => 'email' ) );
+        }
 
         if ( $errors->get_error_codes() )