Changeset 12981

Timestamp:

02/06/2010 04:42:14 AM (15 years ago)

Author:

dd32

Message:

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

File:

• trunk/wp-login.php (modified) (4 diffs)

trunk/wp-login.php

@@ -209 +209 @@
 
     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;
@@ -261 +261 @@
 
     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);
@@ -576 +576 @@
 ?>
 
-<?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>
@@ -598 +597 @@
     </p>
 </form>
-<?php endif; ?>
 
 <?php if ( !$interim_login ) { ?>
 <p id="nav">
 <?php if ( isset($_GET['checkemail']) && in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
-<?php elseif (get_option('users_can_register')) : ?>
+<?php elseif ( get_option('users_can_register') ) : ?>
 <a href="<?php echo site_url('wp-login.php?action=register', 'login') ?>"><?php _e('Register') ?></a> |
 <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>