Changeset 6396

Timestamp:

12/17/07 06:02:45 (7 months ago)

Author:

ryan

Message:

wp_set_password(). see #2394

Files:

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

trunk/wp-includes/pluggable.php

@@ -305 +305 @@
-    }
-
-login
-
-login || ($login
+user
+
+user || ($user
-        $error = __('<strong>ERROR</strong>: Invalid username.');
-        return false;
-    }
-
-login
+user
-        $error = __('<strong>ERROR</strong>: Incorrect password.');
-        return false;
@@ -318 +318 @@
-
-    // If using old md5 password, rehash.
-
-
-
-
-
+
+
-
-    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();
-
-
-
+
-    $message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
-    $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";