Changeset 6396

Timestamp:

12/17/2007 06:02:45 AM (17 years ago)

Author:

ryan

Message:

wp_set_password(). see #2394

Location:

trunk

Files:

• wp-includes/pluggable.php (modified) (3 diffs)
• wp-login.php (modified) (1 diff)

trunk/wp-includes/pluggable.php

@@ -305 +305 @@
     }
 
-    $login = get_userdatabylogin($username);
-
-    if ( !$login || ($login->user_login != $username) ) {
+    $user = get_userdatabylogin($username);
+
+    if ( !$user || ($user->user_login != $username) ) {
         $error = __('<strong>ERROR</strong>: Invalid username.');
         return false;
     }
 
-    if ( !wp_check_password($password, $login->user_pass) ) {
+    if ( !wp_check_password($password, $user->user_pass) ) {
         $error = __('<strong>ERROR</strong>: Incorrect password.');
         return false;
@@ -318 +318 @@
 
     // If using old md5 password, rehash.
-    if ( strlen($login->user_pass) <= 32 ) {
-        $hash = wp_hash_password($password);
-        $wpdb->query("UPDATE $wpdb->users SET user_pass = '$hash', user_activation_key = '' WHERE ID = '$login->ID'");
-        wp_cache_delete($login->ID, 'users');
-    }
+    if ( strlen($user->user_pass) <= 32 )
+        wp_set_password($password, $user->ID);
 
     return true;
@@ -771 +768 @@
 endif;
 
+if ( !function_exists('wp_set_password') ) :
+function wp_set_password( $password, $user_id ) {
+    global $wpdb;
+
+    $hash = wp_hash_password($password);
+    $query = $wpdb->prepare("UPDATE $wpdb->users SET user_pass = %s, user_activation_key = '' WHERE ID = %d", $hash, $user_id);
+    $wpdb->query($query);
+    wp_cache_delete($user_id, 'users');
+}
+endif;
+
 // Deprecated. Use wp_set_auth_cookie()
 if ( !function_exists('wp_setcookie') ) :

trunk/wp-login.php

@@ -185 +185 @@
     // Generate something random for a password...
     $new_pass = wp_generate_password();
-    $new_hash = wp_hash_password($new_pass); 
-    $wpdb->query("UPDATE $wpdb->users SET user_pass = '$new_hash', user_activation_key = '' WHERE ID = '$user->ID'");
-    wp_cache_delete($user->ID, 'users');
+    wp_set_password($new_pass, $user->ID);
     $message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
     $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";