Show login form upon email-sent for recover/reset passwords. Props nacin. Fixes #11141
git-svn-id: http://svn.automattic.com/wordpress/trunk@12981 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
9147f8ba7e
commit
fc6c57b180
|
@ -208,7 +208,7 @@ function retrieve_password() {
|
|||
$message = apply_filters('retrieve_password_message', $message, $key);
|
||||
|
||||
if ( $message && !wp_mail($user_email, $title, $message) )
|
||||
die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
|
||||
wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') );
|
||||
|
||||
return true;
|
||||
}
|
||||
|
@ -260,7 +260,7 @@ function reset_password($key, $login) {
|
|||
$message = apply_filters('password_reset_message', $message, $new_pass);
|
||||
|
||||
if ( $message && !wp_mail($user->user_email, $title, $message) )
|
||||
die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
|
||||
wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') );
|
||||
|
||||
wp_password_change_notification($user);
|
||||
|
||||
|
@ -575,7 +575,6 @@ default:
|
|||
$user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(stripslashes($_POST['log'])) : '';
|
||||
?>
|
||||
|
||||
<?php if ( !isset($_GET['checkemail']) || !in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
|
||||
<form name="loginform" id="loginform" action="<?php echo site_url('wp-login.php', 'login_post') ?>" method="post">
|
||||
<p>
|
||||
<label><?php _e('Username') ?><br />
|
||||
|
@ -597,7 +596,6 @@ default:
|
|||
<input type="hidden" name="testcookie" value="1" />
|
||||
</p>
|
||||
</form>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ( !$interim_login ) { ?>
|
||||
<p id="nav">
|
||||
|
|
Loading…
Reference in New Issue