Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Login: Improve the error message when retrieving a lost password.

Browse Source 
When an invalid username or email address is entered, the form now displays a better error message.

Props mrtortai, iamfriendly, TomHarrigan, afercia, pento.
Fixes #31788.


Built from https://develop.svn.wordpress.org/trunk@44489


git-svn-id: http://core.svn.wordpress.org/trunk@44320 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2019-01-09 02:06:50 +00:00
parent 942f35446f
commit 19f9dd29e9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.1-alpha-44488';
$wp_version = '5.1-alpha-44489';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

4
wp-login.php
View File

@ -334,7 +334,7 @@ function retrieve_password() {
} elseif ( strpos( $_POST['user_login'], '@' ) ) {
$user_data = get_user_by( 'email', trim( wp_unslash( $_POST['user_login'] ) ) );
if ( empty( $user_data ) ) {
$errors->add( 'invalid_email', __( '<strong>ERROR</strong>: There is no user registered with that email address.' ) );
$errors->add( 'invalid_email', __( '<strong>ERROR</strong>: There is no account with that username or email address.' ) );
}
} else {
$login = trim( $_POST['user_login'] );
@ -357,7 +357,7 @@ function retrieve_password() {
}
if ( ! $user_data ) {
$errors->add( 'invalidcombo', __( '<strong>ERROR</strong>: Invalid username or email.' ) );
$errors->add( 'invalidcombo', __( '<strong>ERROR</strong>: There is no account with that username or email address.' ) );
return $errors;
}