diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 02:10:03 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 02:10:03 +0200 |
| commit | 0a79930387ed9707f8c4cbca424820b107c9ac1d (patch) | |
| tree | e0fc0438bffb46ff83512dc0c4c9482e28109c4b /phpBB/includes/auth/auth_db.php | |
| parent | 5f73cdcdc295aeded117377496e9917c712f353f (diff) | |
| parent | 7e4460dbc99ce25dbeaa57eaedddea6112cfb9bf (diff) | |
| download | forums-0a79930387ed9707f8c4cbca424820b107c9ac1d.tar forums-0a79930387ed9707f8c4cbca424820b107c9ac1d.tar.gz forums-0a79930387ed9707f8c4cbca424820b107c9ac1d.tar.bz2 forums-0a79930387ed9707f8c4cbca424820b107c9ac1d.tar.xz forums-0a79930387ed9707f8c4cbca424820b107c9ac1d.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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 d17ec6ba86..b4ae1911cf 100644 --- a/phpBB/includes/auth/auth_db.php +++ b/phpBB/includes/auth/auth_db.php @@ -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']) |