From bb836b65e3c16fadf5c13510cce73daf432f7ad8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 25 Oct 2013 15:21:09 +0200
Subject: [feature/passwords] Integrate convert_flag with db auth provider

PHPBB3-11610
---
 phpBB/phpbb/auth/provider/db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/auth/provider/db.php')

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);
 
-- 
cgit v1.2.1