mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
[ticket/13332] Pass user row to passwords manager check method
PHPBB3-13332
This commit is contained in:
parent
cd6085ebdc
commit
040fc6dd0f
1 changed files with 2 additions and 2 deletions
|
@ -87,7 +87,7 @@ class db extends \phpbb\auth\provider\base
|
||||||
|
|
||||||
$username_clean = utf8_clean_string($username);
|
$username_clean = utf8_clean_string($username);
|
||||||
|
|
||||||
$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type, user_login_attempts
|
$sql = 'SELECT *
|
||||||
FROM ' . USERS_TABLE . "
|
FROM ' . USERS_TABLE . "
|
||||||
WHERE username_clean = '" . $this->db->sql_escape($username_clean) . "'";
|
WHERE username_clean = '" . $this->db->sql_escape($username_clean) . "'";
|
||||||
$result = $this->db->sql_query($sql);
|
$result = $this->db->sql_query($sql);
|
||||||
|
@ -175,7 +175,7 @@ class db extends \phpbb\auth\provider\base
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check password ...
|
// Check password ...
|
||||||
if ($this->passwords_manager->check($password, $row['user_password']))
|
if ($this->passwords_manager->check($password, $row['user_password'], $row))
|
||||||
{
|
{
|
||||||
// Check for old password hash...
|
// Check for old password hash...
|
||||||
if ($this->passwords_manager->convert_flag || strlen($row['user_password']) == 32)
|
if ($this->passwords_manager->convert_flag || strlen($row['user_password']) == 32)
|
||||||
|
|
Loading…
Add table
Reference in a new issue