Changeset 15799

Timestamp:

10/13/2010 08:26:43 PM (14 years ago)

Author:

ryan

Message:

Fix notice when creating users. Props coffee2code. fixes #14286

File:

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

trunk/wp-admin/includes/user.php

@@ -170 +170 @@
     } elseif ( !is_email( $user->user_email ) ) {
         $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The e-mail address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
-    } elseif ( ( $owner_id = email_exists($user->user_email) ) && $owner_id != $user->ID ) {
+    } elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) {
         $errors->add( 'email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'), array( 'form-field' => 'email' ) );
     }