Changes from trunk/wp-login.php at r11514 to branches/2.8/wp-login.php at r11804
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.8/wp-login.php
r11514 r11804 162 162 $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; 163 163 $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n"; 164 $message .= site_url("wp-login.php?action=rp&key=$key ", 'login') . "\r\n";164 $message .= site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . "\r\n"; 165 165 166 166 $title = sprintf(__('[%s] Password Reset'), get_option('blogname')); … … 183 183 * @return bool|WP_Error 184 184 */ 185 function reset_password($key ) {185 function reset_password($key, $login) { 186 186 global $wpdb; 187 187 188 188 $key = preg_replace('/[^a-z0-9]/i', '', $key); 189 189 190 if ( empty( $key ) )190 if ( empty( $key ) || !is_string( $key ) ) 191 191 return new WP_Error('invalid_key', __('Invalid key')); 192 192 193 $user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s", $key)); 193 if ( empty($login) || !is_string($login) ) 194 return new WP_Error('invalid_key', __('Invalid key')); 195 196 $user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $key, $login)); 194 197 if ( empty( $user ) ) 195 198 return new WP_Error('invalid_key', __('Invalid key')); … … 371 374 case 'resetpass' : 372 375 case 'rp' : 373 $errors = reset_password($_GET['key'] );376 $errors = reset_password($_GET['key'], $_GET['login']); 374 377 375 378 if ( ! is_wp_error($errors) ) {
Note: See TracChangeset
for help on using the changeset viewer.