diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 02:09:29 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 02:09:29 +0200 |
| commit | c916d49ddd6d7ad6ad508dd8981bc85f98a0e744 (patch) | |
| tree | 85693ce5d30a2c29e68673aaab7e0b2f928424b3 /phpBB | |
| parent | 7ca9c33157ad360750df8bf025a1155e14c6b2bb (diff) | |
| parent | 0d602e1722a0a75f2f4a9ab90eeeb2a47042417f (diff) | |
| download | forums-c916d49ddd6d7ad6ad508dd8981bc85f98a0e744.tar forums-c916d49ddd6d7ad6ad508dd8981bc85f98a0e744.tar.gz forums-c916d49ddd6d7ad6ad508dd8981bc85f98a0e744.tar.bz2 forums-c916d49ddd6d7ad6ad508dd8981bc85f98a0e744.tar.xz forums-c916d49ddd6d7ad6ad508dd8981bc85f98a0e744.zip | |
Merge remote-tracking branch 'naderman/ticket/10247' into prep-release-3.0.9
* naderman/ticket/10247:
[ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/auth/auth_db.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php index 018d5cce70..6ca69d9174 100644 --- a/phpBB/includes/auth/auth_db.php +++ b/phpBB/includes/auth/auth_db.php @@ -72,7 +72,7 @@ function login_db($username, $password, $ip = '', $browser = '', $forwarded_for if (($ip && !$config['ip_login_limit_use_forwarded']) || ($forwarded_for && $config['ip_login_limit_use_forwarded'])) { - $sql = 'SELECT COUNT(attempt_id) AS attempts + $sql = 'SELECT COUNT(*) AS attempts FROM ' . LOGIN_ATTEMPT_TABLE . ' WHERE attempt_time > ' . (time() - (int) $config['ip_login_limit_time']); if ($config['ip_login_limit_use_forwarded']) |