WordPress.org

Make WordPress Core

Ticket #14286: 14286.diff

File 14286.diff, 909 bytes (added by coffee2code, 10 years ago)
  • wp-admin/includes/user.php

     
    169169                $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) );
    170170        } elseif ( !is_email( $user->user_email ) ) {
    171171                $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The e-mail address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
    172         } elseif ( ( $owner_id = email_exists($user->user_email) ) && $owner_id != $user->ID ) {
     172        } elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) {
    173173                $errors->add( 'email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'), array( 'form-field' => 'email' ) );
    174174        }
    175175