Ticket #14286: 14286.diff

wp-admin/includes/user.php

@@ -169 +169 @@
                 $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&#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' ) );
         }