aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-07-04 19:57:54 -0400
committerNils Adermann <naderman@naderman.de>2011-07-04 19:57:54 -0400
commit0d602e1722a0a75f2f4a9ab90eeeb2a47042417f (patch)
treedd66f743621f5a6810025155f0d6d9f4c89842d9
parentcb7604dcd83bf3a4ddf6ace1282974eaf475c8d8 (diff)
downloadforums-0d602e1722a0a75f2f4a9ab90eeeb2a47042417f.tar
forums-0d602e1722a0a75f2f4a9ab90eeeb2a47042417f.tar.gz
forums-0d602e1722a0a75f2f4a9ab90eeeb2a47042417f.tar.bz2
forums-0d602e1722a0a75f2f4a9ab90eeeb2a47042417f.tar.xz
forums-0d602e1722a0a75f2f4a9ab90eeeb2a47042417f.zip
[ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
attempt_id column was deleted PHPBB3-10247
-rw-r--r--phpBB/includes/auth/auth_db.php2
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'])