Ticket #36010: 36010.labels-plus-new-step.01.diff

src/wp-login.php

@@ -557 +557 @@
          */
         do_action( 'lostpassword_form' ); ?>
         <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
-        <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Get New Password'); ?>" /></p>
+        <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Start Password Reset'); ?>" /></p>
 </form>
 
 <p id="nav">
@@ -626 +626 @@
         if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && !empty( $_POST['pass1'] ) ) {
                 reset_password($user, $_POST['pass1']);
                 setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
-                login_header( __( 'Password Reset' ), '<p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a></p>' );
+                $new_pass_login_url = add_query_arg( array( 'reset-pass' => 'success' ), wp_login_url() );
+                login_header( __( 'Password Reset' ), '<p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( $new_pass_login_url ) . '">' . __( 'Log in' ) . '</a></p>' );
                 login_footer();
                 exit;
         }
@@ -634 +635 @@
         wp_enqueue_script('utils');
         wp_enqueue_script('user-profile');
 
-        login_header(__('Reset Password'), '<p class="message reset-pass">' . __('Enter your new password below.') . '</p>', $errors );
+        login_header(__('Reset Password'), '<p class="message reset-pass">' . __('Enter your new password or use the suggested password.') . '</p>', $errors );
 
 ?>
 <form name="resetpassform" id="resetpassform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=resetpass', 'login_post' ) ); ?>" method="post" autocomplete="off">
@@ -681 +682 @@
         do_action( 'resetpass_form', $user );
         ?>
         <input type="hidden" name="rp_key" value="<?php echo esc_attr( $rp_key ); ?>" />
-        <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Reset Password'); ?>" /></p>
+        <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Confirm Password Change'); ?>" /></p>
 </form>
 
 <p id="nav">
@@ -891 +892 @@
                         $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  ( isset($_GET['reset-pass']) && 'success' == $_GET['reset-pass'] )
+                        $errors->add('passreset', __('Using your new password, log in below.'), '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' );
         }