diff options
| -rw-r--r-- | modules/simpletest/tests/upgrade/upgrade.test | 9 | ||||
| -rw-r--r-- | modules/user/user.module | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/modules/simpletest/tests/upgrade/upgrade.test b/modules/simpletest/tests/upgrade/upgrade.test index 0b48db507..263baff48 100644 --- a/modules/simpletest/tests/upgrade/upgrade.test +++ b/modules/simpletest/tests/upgrade/upgrade.test @@ -378,6 +378,15 @@ class BasicUpgradePath extends UpgradePathTestCase { 'pass_raw' => 'admin', )); + // The previous login should've triggered a password rehash, so login one + // more time to make sure the new hash is readable. + $this->drupalLogout(); + $this->drupalLogin((object) array( + 'uid' => 1, + 'name' => 'admin', + 'pass_raw' => 'admin', + )); + // Test that the site name is correctly displayed. $this->assertText('Drupal 6', t('The site name is correctly displayed.')); 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)); } } } |