diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-11-11 19:02:01 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-11-11 19:02:01 +0100 |
| commit | 040fc6dd0feea73d71ca73cc69ecfb55b996b769 (patch) | |
| tree | 154ca1a5143770b4d77a262ac7c671473f9d205b /phpBB/phpbb/auth/provider/db.php | |
| parent | cd6085ebdc3780d1b4551da5fa93d18acc4d11e5 (diff) | |
| download | forums-040fc6dd0feea73d71ca73cc69ecfb55b996b769.tar forums-040fc6dd0feea73d71ca73cc69ecfb55b996b769.tar.gz forums-040fc6dd0feea73d71ca73cc69ecfb55b996b769.tar.bz2 forums-040fc6dd0feea73d71ca73cc69ecfb55b996b769.tar.xz forums-040fc6dd0feea73d71ca73cc69ecfb55b996b769.zip | |
[ticket/13332] Pass user row to passwords manager check method
PHPBB3-13332
Diffstat (limited to 'phpBB/phpbb/auth/provider/db.php')
| -rw-r--r-- | phpBB/phpbb/auth/provider/db.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index 722eeffa9a..1281cb0715 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -87,7 +87,7 @@ class db extends \phpbb\auth\provider\base $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 . " WHERE username_clean = '" . $this->db->sql_escape($username_clean) . "'"; $result = $this->db->sql_query($sql); @@ -175,7 +175,7 @@ class db extends \phpbb\auth\provider\base } // 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... if ($this->passwords_manager->convert_flag || strlen($row['user_password']) == 32) |