aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/passwords/manager.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-09-25 20:32:42 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-10-03 22:09:22 +0200
commit722639a0e213e905cfb4a01aa54e638f7670ba63 (patch)
tree5f61072382f92ff684014c9122401904336f12d1 /phpBB/phpbb/passwords/manager.php
parentd15269950d8f577a69f3359614d48087c84d4cec (diff)
downloadforums-722639a0e213e905cfb4a01aa54e638f7670ba63.tar
forums-722639a0e213e905cfb4a01aa54e638f7670ba63.tar.gz
forums-722639a0e213e905cfb4a01aa54e638f7670ba63.tar.bz2
forums-722639a0e213e905cfb4a01aa54e638f7670ba63.tar.xz
forums-722639a0e213e905cfb4a01aa54e638f7670ba63.zip
[ticket/14733] Extend passwords driver_interface in rehashable_driver_interface
PHPBB3-14733
Diffstat (limited to 'phpBB/phpbb/passwords/manager.php')
-rw-r--r--phpBB/phpbb/passwords/manager.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/phpbb/passwords/manager.php b/phpBB/phpbb/passwords/manager.php
index 38c12995b4..6c3ef4c477 100644
--- a/phpBB/phpbb/passwords/manager.php
+++ b/phpBB/phpbb/passwords/manager.php
@@ -297,7 +297,14 @@ class manager
}
else
{
- $this->convert_flag = $stored_hash_type->needs_rehash($hash);
+ if ($stored_hash_type instanceof driver\rehashable_driver_interface)
+ {
+ $this->convert_flag = $stored_hash_type->needs_rehash($hash);
+ }
+ else
+ {
+ $this->convert_flag = false;
+ }
}
// Check all legacy hash types if prefix is $CP$