Changeset 48304 for trunk/src/wp-login.php

Timestamp:

07/04/2020 09:56:54 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Login and Registration: Hide the login form on the "check your email" step of new user registration or password reset.

This aims to reduce some confusion and make it clearer that the email should be checked before attempting to log in right away.

Props rianrietveld, pratik028, bdbch, johnbillion, hankthetank, yashrs, williampatton, audrasjb, bmartinent, florianatwhodunit, henry.wright, birgire, SergeyBiryukov.
Fixes #40605, #41514.

File:

• trunk/src/wp-login.php (modified) (5 diffs)

trunk/src/wp-login.php

@@ -493 +493 @@
 }
 
+if ( isset( $_GET['checkemail'] ) ) {
+    $action = 'checkemail';
+}
+
 $default_actions = array(
     'confirm_admin_email',
@@ -502 +506 @@
     'rp',
     'register',
+    'checkemail',
     'login',
     'confirmaction',
@@ -1129 +1134 @@
 
         login_footer( 'user_login' );
+        break;
+
+    case 'checkemail':
+        $redirect_to = admin_url();
+        $errors      = new WP_Error();
+
+        if ( 'confirm' === $_GET['checkemail'] ) {
+            $errors->add(
+                'confirm',
+                sprintf(
+                    /* translators: %s: Link to the login page. */
+                    __( 'Check your email for the confirmation link, then visit the <a href="%s">login page</a>.' ),
+                    wp_login_url()
+                ),
+                'message'
+            );
+        } elseif ( 'registered' === $_GET['checkemail'] ) {
+            $errors->add(
+                'registered',
+                sprintf(
+                    /* translators: %s: Link to the login page. */
+                    __( 'Registration complete. Please check your email, then visit the <a href="%s">login page</a>.' ),
+                    wp_login_url()
+                ),
+                'message'
+            );
+        }
+
+        /** This action is documented in wp-login.php */
+        $errors = apply_filters( 'wp_login_errors', $errors, $redirect_to );
+
+        login_header( __( 'Log In' ), '', $errors );
+        login_footer();
         break;
 
@@ -1329 +1367 @@
             } 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'] ) && 'registered' === $_GET['checkemail'] ) {
-                $errors->add( 'registered', __( 'Registration complete. Please check your email.' ), 'message' );
             } elseif ( strpos( $redirect_to, 'about.php?updated' ) ) {
                 $errors->add( 'updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );
@@ -1430 +1464 @@
                 <?php
 
-                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' ) );
-
-                        /** This filter is documented in wp-includes/general-template.php */
-                        echo apply_filters( 'register', $registration_url );
-
-                        echo esc_html( $login_link_separator );
-                    }
-
-                    ?>
-                    <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
-                    <?php
+                if ( get_option( 'users_can_register' ) ) {
+                    $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
+
+                    /** This filter is documented in wp-includes/general-template.php */
+                    echo apply_filters( 'register', $registration_url );
+
+                    echo esc_html( $login_link_separator );
                 }
 
                 ?>
+                <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
             </p>
             <?php