Make WordPress Core

Ticket #31788: 31788.3.diff

File 31788.3.diff, 966 bytes (added by TomHarrigan, 5 years ago)

Fix typo from last refresh, keep second string instance with 'invalidcombo' rather than mistakenly changing to 'invalid_email'

  • wp-login.php

     
    334334        } elseif ( strpos( $_POST['user_login'], '@' ) ) {
    335335                $user_data = get_user_by( 'email', trim( wp_unslash( $_POST['user_login'] ) ) );
    336336                if ( empty( $user_data ) ) {
    337                         $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: There is no user registered with that email address.' ) );
     337                        $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: There are no user accounts using that username or email address.' ) );
    338338                }
    339339        } else {
    340340                $login     = trim( $_POST['user_login'] );
     
    357357        }
    358358
    359359        if ( ! $user_data ) {
    360                 $errors->add( 'invalidcombo', __( '<strong>ERROR</strong>: Invalid username or email.' ) );
     360                $errors->add( 'invalidcombo', __( '<strong>ERROR</strong>: There are no user accounts using that username or email address.' ) );
    361361                return $errors;
    362362        }
    363363