diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 02:09:47 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 02:09:47 +0200 |
| commit | 7e4460dbc99ce25dbeaa57eaedddea6112cfb9bf (patch) | |
| tree | 07c03e9dc65b42e0ee29b0334a2bfa97f59bb032 /phpBB/includes/auth/auth_db.php | |
| parent | fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8 (diff) | |
| parent | c916d49ddd6d7ad6ad508dd8981bc85f98a0e744 (diff) | |
| download | forums-7e4460dbc99ce25dbeaa57eaedddea6112cfb9bf.tar forums-7e4460dbc99ce25dbeaa57eaedddea6112cfb9bf.tar.gz forums-7e4460dbc99ce25dbeaa57eaedddea6112cfb9bf.tar.bz2 forums-7e4460dbc99ce25dbeaa57eaedddea6112cfb9bf.tar.xz forums-7e4460dbc99ce25dbeaa57eaedddea6112cfb9bf.zip | |
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
[ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
Diffstat (limited to 'phpBB/includes/auth/auth_db.php')
| -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']) |