aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/auth/provider/db.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-10-25 15:21:09 +0200
committerMarc Alexander <admin@m-a-styles.de>2013-10-25 15:21:09 +0200
commitbb836b65e3c16fadf5c13510cce73daf432f7ad8 (patch)
tree6c7f7a187b88d77031642ef4acadd9f62bd36877 /phpBB/phpbb/auth/provider/db.php
parent87bd628241b002c866c0d425cd8c95a42d04f31a (diff)
downloadforums-bb836b65e3c16fadf5c13510cce73daf432f7ad8.tar
forums-bb836b65e3c16fadf5c13510cce73daf432f7ad8.tar.gz
forums-bb836b65e3c16fadf5c13510cce73daf432f7ad8.tar.bz2
forums-bb836b65e3c16fadf5c13510cce73daf432f7ad8.tar.xz
forums-bb836b65e3c16fadf5c13510cce73daf432f7ad8.zip
[feature/passwords] Integrate convert_flag with db auth provider
PHPBB3-11610
Diffstat (limited to 'phpBB/phpbb/auth/provider/db.php')
-rw-r--r--phpBB/phpbb/auth/provider/db.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php
index de07a84cf5..aa597c8e9f 100644
--- a/phpBB/phpbb/auth/provider/db.php
+++ b/phpBB/phpbb/auth/provider/db.php
@@ -245,7 +245,7 @@ class db extends \phpbb\auth\provider\base
if (!$row['user_pass_convert'] && $this->passwords_manager->check($password, $row['user_password']))
{
// Check for old password hash...
- if (strlen($row['user_password']) == 32)
+ if ($this->passwords_manager->convert_flag || strlen($row['user_password']) == 32)
{
$hash = $this->passwords_manager->hash($password);