Make WordPress Core

Ticket #9563: 9563.diff

File 9563.diff, 1.3 KB (added by Denis-de-Bernardy, 15 years ago)
  • Users/denis/Sites/sem-pro/wp-admin/includes/user.php

     
    167167
    168168        /* checking e-mail address */
    169169        if ( empty ( $user->user_email ) ) {
    170                 $errors->add( 'user_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) );
    171         } else
    172                 if (!is_email( $user->user_email ) ) {
    173                         $errors->add( 'user_email', __( "<strong>ERROR</strong>: The e-mail address isn't correct." ), array( 'form-field' => 'email' ) );
    174                 }
     170                $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) );
     171        } elseif (!is_email( $user->user_email ) ) {
     172                $errors->add( 'invalid_email', __( "<strong>ERROR</strong>: The e-mail address isn't correct." ), array( 'form-field' => 'email' ) );
     173        } elseif ( ( $owner_id = email_exists($user->user_email) ) && $owner_id != $user->ID ) {
     174                $errors->add( 'email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'), array( 'form-field' => 'email' ) );
     175        }
    175176
    176177        if ( $errors->get_error_codes() )
    177178                return $errors;