From 22f0ba528f7b579868b793664cf9c7875b788fd1 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Tue, 28 Dec 2010 21:46:23 +0000
Subject: #1007504 by carlos8f, pioterw: Fixed Rehashed passwords after Drupal
 6 upgrade fail

---
 modules/user/user.module | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/user.module b/modules/user/user.module
index 212724775..b7ebfdd10 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -2180,10 +2180,7 @@ function user_authenticate($name, $password) {
 
         // Update user to new password scheme if needed.
         if (user_needs_new_hash($account)) {
-          $new_hash = user_hash_password($password);
-          if ($new_hash) {
-            user_save($account, array('pass' => $new_hash));
-          }
+          user_save($account, array('pass' => $password));
         }
       }
     }
-- 
cgit v1.2.3