1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-24 20:17:58 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
This commit is contained in:
Andreas Fischer
2011-07-05 02:10:03 +02:00

View File

@ -73,7 +73,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'])