<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[48304] trunk/src/wp-login.php: Login and Registration: Hide the login form on the "check your email" step of new user registration or password reset.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/48304">48304</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/48304","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-04 21:56:54 +0000 (Sat, 04 Jul 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/40605">#40605</a>, <a href="https://core.trac.wordpress.org/ticket/41514">#41514</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwploginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-login.php 2020-07-04 21:13:56 UTC (rev 48303)
+++ trunk/src/wp-login.php 2020-07-04 21:56:54 UTC (rev 48304)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -492,6 +492,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $action = 'resetpass';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_GET['checkemail'] ) ) {
+ $action = 'checkemail';
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $default_actions = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'confirm_admin_email',
</span><span class="cx" style="display: block; padding: 0 10px"> 'postpass',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -501,6 +505,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'resetpass',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rp',
</span><span class="cx" style="display: block; padding: 0 10px"> 'register',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'checkemail',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'login',
</span><span class="cx" style="display: block; padding: 0 10px"> 'confirmaction',
</span><span class="cx" style="display: block; padding: 0 10px"> WP_Recovery_Mode_Link_Service::LOGIN_ACTION_ENTERED,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1130,6 +1135,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> login_footer( 'user_login' );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'confirmaction':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_GET['request_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Missing request ID.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1328,10 +1366,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'loggedout', __( 'You are now logged out.' ), 'message' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_GET['registration'] ) && 'disabled' === $_GET['registration'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'registerdisabled', __( 'User registration is currently not allowed.' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } 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' );
</del><span class="cx" style="display: block; padding: 0 10px"> } elseif ( strpos( $redirect_to, 'about.php?updated' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what’s new.' ), 'message' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( WP_Recovery_Mode_Link_Service::LOGIN_ACTION_ENTERED === $action ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1429,22 +1463,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p id="nav">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_option( 'users_can_register' ) ) {
+ $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** This filter is documented in wp-includes/general-template.php */
- echo apply_filters( 'register', $registration_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This filter is documented in wp-includes/general-template.php */
+ echo apply_filters( 'register', $registration_url );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo esc_html( $login_link_separator );
- }
-
- ?>
- <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo esc_html( $login_link_separator );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>