From b810957c4bc4ffa86dd4db4cce26bd49d7008670 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 22 Aug 2013 19:31:35 -0500
Subject: [feature/passwords] Properly set convert_flag and add test for it
PHPBB3-11610
---
phpBB/phpbb/crypto/manager.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'phpBB/phpbb/crypto')
diff --git a/phpBB/phpbb/crypto/manager.php b/phpBB/phpbb/crypto/manager.php
index e314b08865..885bf719bf 100644
--- a/phpBB/phpbb/crypto/manager.php
+++ b/phpBB/phpbb/crypto/manager.php
@@ -196,10 +196,14 @@ class phpbb_crypto_manager
return $this->helper->check_combined_hash($password, $stored_hash_type, $hash);
}
- if ($stored_hash_type->get_type() !== $this->type)
+ if ($stored_hash_type->get_name() !== $this->type)
{
$this->convert_flag = true;
}
+ else
+ {
+ $this->convert_flag = false;
+ }
return $stored_hash_type->check($password, $hash);
}
--
cgit v1.2.1