diff -ur wordpress-old/readme.html wordpress/readme.html --- wordpress-old/readme.html 2009-08-03 01:18:57.000000000 +0200 +++ wordpress/readme.html 2009-08-12 02:41:44.000000000 +0200 @@ -8,7 +8,7 @@

WordPress -
Version 2.8.3 +
Version 2.8.4

Semantic Personal Publishing Platform

@@ -29,7 +29,7 @@

Upgrading

Before you upgrade anything, make sure you have backup copies of any files you may have modified such as index.php.

-

Upgrading from any previous WordPress to 2.8.3:

+

Upgrading from any previous WordPress to 2.8.4:

  1. Delete your old WP files, saving ones you've modified.
  2. Upload the new files.
    3. diff -ur wordpress-old/wp-includes/version.php wordpress/wp-includes/version.php --- wordpress-old/wp-includes/version.php 2009-08-03 01:18:57.000000000 +0200 +++ wordpress/wp-includes/version.php 2009-08-12 02:41:44.000000000 +0200 @@ -8,7 +8,7 @@ * * @global string $wp_version */ -$wp_version = '2.8.3'; +$wp_version = '2.8.4'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff -ur wordpress-old/wp-login.php wordpress/wp-login.php --- wordpress-old/wp-login.php 2009-06-04 00:15:22.000000000 +0200 +++ wordpress/wp-login.php 2009-08-11 08:03:45.000000000 +0200 @@ -161,7 +161,7 @@ $message .= get_option('siteurl') . "\r\n\r\n"; $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')); @@ -182,15 +182,18 @@ * @param string $key Hash to validate sending user's password * @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')); @@ -370,7 +373,7 @@ case 'resetpass' : case 'rp' : - $errors = reset_password($_GET['key']); + $errors = reset_password($_GET['key'], $_GET['login']); if ( ! is_wp_error($errors) ) { wp_redirect('wp-login.php?checkemail=newpass');