Ticket #40605: 40605.5.diff

src/wp-login.php

@@ -511 +511 @@
         $action = 'login';
 }
 
+if ( isset( $_GET['checkemail'] ) && in_array( $_GET['checkemail'], array( 'confirm' ), true ) ) {
+        $action = 'checkemailconfirm';
+}
+
 nocache_headers();
 
 header( 'Content-Type: ' . get_bloginfo( 'html_type' ) . '; charset=' . get_bloginfo( 'charset' ) );
@@ -1168 +1172 @@
                 login_footer();
                 exit;
 
+        case 'checkemailconfirm':
+                $secure_cookie = '';
+                $redirect_to   = admin_url();
+                $errors        = new WP_Error();
+
+                $errors->add(
+                        'confirm',
+                        sprintf(
+                                /* Translators: 1 is a link to the login url. */
+                                __( 'Check your email for the confirmation link. Then go to <a href="%1$s">Login Page</a>' ),
+                                wp_login_url()
+                        ),
+                        'message'
+                );
+
+                /**
+                 * Filters the login page errors.
+                 *
+                 * @since 3.6.0
+                 *
+                 * @param object $errors      WP Error object.
+                 * @param string $redirect_to Redirect destination URL.
+                 */
+                $errors = apply_filters( 'wp_login_errors', $errors, $redirect_to );
+                login_header( __( 'Log In' ), '', $errors );
+                login_footer();
+                break;
+
         case 'login':
         default:
                 $secure_cookie   = '';
@@ -1328 +1360 @@
                                 $errors->add( 'loggedout', __( 'You are now logged out.' ), 'message' );
                         } elseif ( isset( $_GET['registration'] ) && 'disabled' === $_GET['registration'] ) {
                                 $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'] ) {
@@ -1431 +1461 @@
                         <p id="nav">
                                 <?php
 
-                                if ( ! isset( $_GET['checkemail'] ) || ! in_array( $_GET['checkemail'], array( 'confirm', 'newpass' ), true ) ) {
+                                if ( ! isset( $_GET['checkemail'] ) || 'newpass' !== $_GET['checkemail'] ) {
                                         if ( get_option( 'users_can_register' ) ) {
                                                 $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );