Ignore activation key in db.

Generate a correct key, thanks mtdewvirus


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1273 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 4 insertions, 4 deletions

diff --git a/wp-login.php b/wp-login.php
index 6222791..121369a 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -90,14 +90,14 @@ function retrieve_password() {
 	do_action('retreive_password', $user_login);  // Misspelled and deprecated
 	do_action('retrieve_password', $user_login);
 
-	$key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE user_login = %s", $user_login));
-	if ( empty($key) ) {
+	//$key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE user_login = %s", $user_login));
+	//if ( empty($key) ) {
 		// Generate something random for a key...
-		$key = wp_generate_password();
+		$key = wp_generate_password(20, false);
 		do_action('retrieve_password_key', $user_login, $key);
 		// Now insert the new md5 key into the db
 		$wpdb->query($wpdb->prepare("UPDATE $wpdb->users SET user_activation_key = %s WHERE user_login = %s", $key, $user_login));
-	}
+	//}
 	$message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n";
 	$message .= get_option('siteurl') . "\r\n\r\n";
 	$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";