<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11801] trunk/wp-login.php: Pass user login when resetting passwords.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11801">11801</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-08-11 05:48:44 +0000 (Tue, 11 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pass user login when resetting passwords.</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 (11800 => 11801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2009-08-11 05:31:28 UTC (rev 11800)
+++ trunk/wp-login.php 2009-08-11 05:48:44 UTC (rev 11801)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> $message .= get_option('siteurl') . "\r\n\r\n";
</span><span class="cx"> $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
</span><span class="cx"> $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
</span><del>- $message .= site_url("wp-login.php?action=rp&key=$key", 'login') . "\r\n";
</del><ins>+ $message .= site_url("wp-login.php?action=rp&key=$key&login=$user_login", 'login') . "\r\n";
</ins><span class="cx">
</span><span class="cx"> $title = sprintf(__('[%s] Password Reset'), get_option('blogname'));
</span><span class="cx">
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> * @param string $key Hash to validate sending user's password
</span><span class="cx"> * @return bool|WP_Error
</span><span class="cx"> */
</span><del>-function reset_password($key) {
</del><ins>+function reset_password($key, $login) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $key = preg_replace('/[^a-z0-9]/i', '', $key);
</span><span class="lines">@@ -190,7 +190,10 @@
</span><span class="cx"> if ( empty( $key ) || !is_string( $key ) )
</span><span class="cx"> return new WP_Error('invalid_key', __('Invalid key'));
</span><span class="cx">
</span><del>- $user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s", $key));
</del><ins>+ if ( empty($login) || !is_string($login) )
+ return new WP_Error('invalid_key', __('Invalid key'));
+
+ $user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $key, $login));
</ins><span class="cx"> if ( empty( $user ) )
</span><span class="cx"> return new WP_Error('invalid_key', __('Invalid key'));
</span><span class="cx">
</span><span class="lines">@@ -370,7 +373,7 @@
</span><span class="cx">
</span><span class="cx"> case 'resetpass' :
</span><span class="cx"> case 'rp' :
</span><del>- $errors = reset_password($_GET['key']);
</del><ins>+ $errors = reset_password($_GET['key'], $_GET['login']);
</ins><span class="cx">
</span><span class="cx"> if ( ! is_wp_error($errors) ) {
</span><span class="cx"> wp_redirect('wp-login.php?checkemail=newpass');
</span></span></pre>
</div>
</div>
</body>
</html>