From 51814d68af6310644c37981491225b9d8b95f6f2 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Mon, 7 Oct 2019 11:54:05 +0000
Subject: [PATCH] Accessibility: Login and Registration: Improve the invalid
 username and invalid email messages.

- explicitly informs users they can use their email to log in as an alternative to their username and vice-versa
- shows the `Lost your password?` link only when an wrong password has been entered
- uses a more appropriate copy by changing "invalid" to "unknown"
- removes the all caps `ERROR`

Props subrataemfluence, zalak151291, ryokuhi, SergeyBiryukov, audrasjb, joedolson, marybaum, ramiy, markjaquith, chanthaboune, afercia.
Fixes #43037.

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


git-svn-id: http://core.svn.wordpress.org/trunk@46215 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/user.php    | 10 ++--------
 wp-includes/version.php |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/wp-includes/user.php b/wp-includes/user.php
index 69b8c35208..505048e57a 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -149,10 +149,7 @@ function wp_authenticate_username_password( $user, $username, $password ) {
 	if ( ! $user ) {
 		return new WP_Error(
 			'invalid_username',
-			__( '<strong>ERROR</strong>: Invalid username.' ) .
-			' <a href="' . wp_lostpassword_url() . '">' .
-			__( 'Lost your password?' ) .
-			'</a>'
+			__( 'Unknown username. Check again or try your email address.' )
 		);
 	}
 
@@ -230,10 +227,7 @@ function wp_authenticate_email_password( $user, $email, $password ) {
 	if ( ! $user ) {
 		return new WP_Error(
 			'invalid_email',
-			__( '<strong>ERROR</strong>: Invalid email address.' ) .
-			' <a href="' . wp_lostpassword_url() . '">' .
-			__( 'Lost your password?' ) .
-			'</a>'
+			__( 'Unknown email address. Check again or try your username.' )
 		);
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 72a9c3a365..6d628cb8b0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-beta2-46416';
+$wp_version = '5.3-beta2-46417';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.