WordPress.org

Make WordPress Core

Ticket #16318: 16318.diff

File 16318.diff, 1.8 KB (added by stephdau, 7 years ago)

Patch to implement Automattic Happiness Engineers suggestion

  • wp-login.php

     
    411411        </p>
    412412<?php do_action('lostpassword_form'); ?>
    413413        <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
    414         <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Get New Password'); ?>" tabindex="100" /></p>
     414        <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Email Password Reset Link'); ?>" tabindex="100" /></p>
    415415</form>
    416416
    417417<p id="nav">
     
    626626        if ( isset($_POST['log']) )
    627627                $user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(stripslashes($_POST['log'])) : '';
    628628        $rememberme = ! empty( $_POST['rememberme'] );
     629       
     630if ( ! isset($_GET['checkemail']) || ! in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) :
    629631?>
    630632
    631633<form name="loginform" id="loginform" action="<?php echo site_url('wp-login.php', 'login_post') ?>" method="post">
     
    650652        </p>
    651653</form>
    652654
    653 <?php if ( !$interim_login ) { ?>
     655<?php
     656endif;
     657if ( !$interim_login ) {
     658?>
    654659<p id="nav">
    655660<?php if ( isset($_GET['checkemail']) && in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
     661<a href="<?php echo site_url('wp-login.php', 'login') ?>"><?php _e('Login') ?></a>
    656662<?php elseif ( get_option('users_can_register') ) : ?>
    657663<a href="<?php echo site_url('wp-login.php?action=register', 'login') ?>"><?php _e('Register') ?></a> |
    658664<a href="<?php echo site_url('wp-login.php?action=lostpassword', 'login') ?>" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>