Changes from trunk/wp-login.php at r11514 to branches/2.8/wp-login.php at r11804

File:

• branches/2.8/wp-login.php (modified) (3 diffs)

branches/2.8/wp-login.php

@@ -162 +162 @@
         $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
         $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
-        $message .= site_url("wp-login.php?action=rp&key=$key", 'login') . "\r\n";
+        $message .= site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . "\r\n";
 
         $title = sprintf(__('[%s] Password Reset'), get_option('blogname'));
@@ -183 +183 @@
  * @return bool|WP_Error
  */
-function reset_password($key) {
+function reset_password($key, $login) {
         global $wpdb;
 
         $key = preg_replace('/[^a-z0-9]/i', '', $key);
 
-        if ( empty( $key ) )
+        if ( empty( $key ) || !is_string( $key ) )
                 return new WP_Error('invalid_key', __('Invalid key'));
 
-        $user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s", $key));
+        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));
         if ( empty( $user ) )
                 return new WP_Error('invalid_key', __('Invalid key'));
@@ -371 +374 @@
 case 'resetpass' :
 case 'rp' :
-        $errors = reset_password($_GET['key']);
+        $errors = reset_password($_GET['key'], $_GET['login']);
 
         if ( ! is_wp_error($errors) ) {