From 6dda17adbeea37e4e30ff44a505b86d2522d1ec7 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 4 Jul 2020 21:13:56 +0000
Subject: [PATCH] Login and Registration: Remove `newpass` value handling in
 `wp-login.php`.

This value is never set as of [15710].

See #40605.

git-svn-id: https://develop.svn.wordpress.org/trunk@48303 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-login.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/wp-login.php b/src/wp-login.php
index 62ccf019f8..0d906fdd2d 100644
--- a/src/wp-login.php
+++ b/src/wp-login.php
@@ -1330,8 +1330,6 @@ switch ( $action ) {
 				$errors->add( 'registerdisabled', __( 'User registration is currently not allowed.' ) );
 			} elseif ( isset( $_GET['checkemail'] ) && 'confirm' === $_GET['checkemail'] ) {
 				$errors->add( 'confirm', __( 'Check your email for the confirmation link.' ), 'message' );
-			} elseif ( isset( $_GET['checkemail'] ) && 'newpass' === $_GET['checkemail'] ) {
-				$errors->add( 'newpass', __( 'Check your email for your new password.' ), 'message' );
 			} elseif ( isset( $_GET['checkemail'] ) && 'registered' === $_GET['checkemail'] ) {
 				$errors->add( 'registered', __( 'Registration complete. Please check your email.' ), 'message' );
 			} elseif ( strpos( $redirect_to, 'about.php?updated' ) ) {
@@ -1431,7 +1429,7 @@ switch ( $action ) {
 			<p id="nav">
 				<?php
 
-				if ( ! isset( $_GET['checkemail'] ) || ! in_array( $_GET['checkemail'], array( 'confirm', 'newpass' ), true ) ) {
+				if ( ! isset( $_GET['checkemail'] ) || 'confirm' !== $_GET['checkemail'] ) {
 					if ( get_option( 'users_can_register' ) ) {
 						$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );