<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12981] trunk/wp-login.php: Show login form upon email-sent for recover/
reset passwords.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12981">12981</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-06 04:42:14 +0000 (Sat, 06 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Show login form upon email-sent for recover/reset passwords. Props nacin. Fixes <a href="http://trac.wordpress.org/ticket/11141">#11141</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (12980 => 12981)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2010-02-06 03:50:55 UTC (rev 12980)
+++ trunk/wp-login.php 2010-02-06 04:42:14 UTC (rev 12981)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> $message = apply_filters('retrieve_password_message', $message, $key);
</span><span class="cx">
</span><span class="cx"> if ( $message && !wp_mail($user_email, $title, $message) )
</span><del>- die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
</del><ins>+ wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') );
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> $message = apply_filters('password_reset_message', $message, $new_pass);
</span><span class="cx">
</span><span class="cx"> if ( $message && !wp_mail($user->user_email, $title, $message) )
</span><del>- die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
</del><ins>+ wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') );
</ins><span class="cx">
</span><span class="cx"> wp_password_change_notification($user);
</span><span class="cx">
</span><span class="lines">@@ -575,7 +575,6 @@
</span><span class="cx"> $user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(stripslashes($_POST['log'])) : '';
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>-<?php if ( !isset($_GET['checkemail']) || !in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
</del><span class="cx"> <form name="loginform" id="loginform" action="<?php echo site_url('wp-login.php', 'login_post') ?>" method="post">
</span><span class="cx"> <p>
</span><span class="cx"> <label><?php _e('Username') ?><br />
</span><span class="lines">@@ -597,12 +596,11 @@
</span><span class="cx"> <input type="hidden" name="testcookie" value="1" />
</span><span class="cx"> </p>
</span><span class="cx"> </form>
</span><del>-<?php endif; ?>
</del><span class="cx">
</span><span class="cx"> <?php if ( !$interim_login ) { ?>
</span><span class="cx"> <p id="nav">
</span><span class="cx"> <?php if ( isset($_GET['checkemail']) && in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
</span><del>-<?php elseif (get_option('users_can_register')) : ?>
</del><ins>+<?php elseif ( get_option('users_can_register') ) : ?>
</ins><span class="cx"> <a href="<?php echo site_url('wp-login.php?action=register', 'login') ?>"><?php _e('Register') ?></a> |
</span><span class="cx"> <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>
</span><span class="cx"> <?php else : ?>
</span></span></pre>
</div>
</div>
</body>
</html>