Ticket #40605: 40605.3.patch

src/wp-login.php

@@ -494 +494 @@
         $action = 'login';
 }
 
+if ( isset( $_GET['checkemail'] ) && $_GET['checkemail'] ) {
+        $action = 'check-email';
+}
+
 nocache_headers();
 
 header( 'Content-Type: ' . get_bloginfo( 'html_type' ) . '; charset=' . get_bloginfo( 'charset' ) );
@@ -1151 +1155 @@
                 login_footer();
                 exit;
 
+        case 'check-email':
+                $secure_cookie = '';
+
+                $redirect_to = admin_url();
+
+                $reauth = empty( $_REQUEST['reauth'] ) ? false : true;
+
+                $user   = wp_signon( array(), $secure_cookie );
+                $errors = $user;
+
+                // Clear errors if loggedout is set.
+                if ( ! empty( $_GET['loggedout'] ) || $reauth ) {
+                        $errors = new WP_Error();
+                }
+
+                if ( isset( $_GET['checkemail'] ) && 'confirm' === $_GET['checkemail'] ) {
+                        $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   = '';