Make WordPress Core

Changeset 12981


Ignore:
Timestamp:
02/06/2010 04:42:14 AM (12 years ago)
Author:
dd32
Message:

Show login form upon email-sent for recover/reset passwords. Props nacin. Fixes #11141

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-login.php

    r12948 r12981  
    209209
    210210    if ( $message && !wp_mail($user_email, $title, $message) )
    211         die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
     211        wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') );
    212212
    213213    return true;
     
    261261
    262262    if ( $message && !wp_mail($user->user_email, $title, $message) )
    263         die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
     263        wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') );
    264264
    265265    wp_password_change_notification($user);
     
    576576?>
    577577
    578 <?php if ( !isset($_GET['checkemail']) || !in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
    579578<form name="loginform" id="loginform" action="<?php echo site_url('wp-login.php', 'login_post') ?>" method="post">
    580579    <p>
     
    598597    </p>
    599598</form>
    600 <?php endif; ?>
    601599
    602600<?php if ( !$interim_login ) { ?>
    603601<p id="nav">
    604602<?php if ( isset($_GET['checkemail']) && in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
    605 <?php elseif (get_option('users_can_register')) : ?>
     603<?php elseif ( get_option('users_can_register') ) : ?>
    606604<a href="<?php echo site_url('wp-login.php?action=register', 'login') ?>"><?php _e('Register') ?></a> |
    607605<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>
Note: See TracChangeset for help on using the changeset viewer.