diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-11-16 12:23:04 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-16 12:23:04 +0100 |
| commit | f1b88706b8930186c8a2dbe216769e2f8350af38 (patch) | |
| tree | 3d3cb3ceee90cf95c18c83f52b6617afee721604 /phpBB | |
| parent | 1f2ec038fbcd35a22cf7ea4571baf347cfe85dac (diff) | |
| parent | e27b69f42a4d23ceb2f19050366a3f7d91887c69 (diff) | |
| download | forums-f1b88706b8930186c8a2dbe216769e2f8350af38.tar forums-f1b88706b8930186c8a2dbe216769e2f8350af38.tar.gz forums-f1b88706b8930186c8a2dbe216769e2f8350af38.tar.bz2 forums-f1b88706b8930186c8a2dbe216769e2f8350af38.tar.xz forums-f1b88706b8930186c8a2dbe216769e2f8350af38.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13332] Fix auth provider tests
[ticket/13332] Remove useless $result assignment
[ticket/13332] Pass user row to passwords manager check method
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/auth/provider/db.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index 722eeffa9a..ba67c11e75 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); @@ -123,7 +123,7 @@ class db extends \phpbb\auth\provider\base 'username_clean' => $username_clean, ); $sql = 'INSERT INTO ' . LOGIN_ATTEMPT_TABLE . $this->db->sql_build_array('INSERT', $attempt_data); - $result = $this->db->sql_query($sql); + $this->db->sql_query($sql); } else { @@ -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) |