diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-12 19:27:01 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-12 19:27:01 +0200 |
| commit | 9b469eb1637a42ba3819ef6a416313d4e0502af5 (patch) | |
| tree | f08af53f9711296d6ea43fc03fb955ffc6f562c9 /phpBB/includes/auth | |
| parent | fe5d616349df911d7053c4862cc734a8de21b4fb (diff) | |
| parent | 4adfa4685096f05e989ba7168bfaa4146e0d7cb4 (diff) | |
| download | forums-9b469eb1637a42ba3819ef6a416313d4e0502af5.tar forums-9b469eb1637a42ba3819ef6a416313d4e0502af5.tar.gz forums-9b469eb1637a42ba3819ef6a416313d4e0502af5.tar.bz2 forums-9b469eb1637a42ba3819ef6a416313d4e0502af5.tar.xz forums-9b469eb1637a42ba3819ef6a416313d4e0502af5.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9892] Correct copyright year
[ticket/9892] Remove incorrect use of camel case
[ticket/9892] Removing closing php tag from create_schema_files
[ticket/9892] Transaction support for database update sql execution function
[ticket/9892] count is a keyword in firebird, so renaming this alias
[ticket/9892] Q&A CAPTCHA did not work on firebird, so no need to change config
[ticket/9892] Shorten login_attempt key names to avoid firebird length problems
[ticket/9892] Drop Q&A CAPTCHA tables if left in inconsistent state
[ticket/9892] Adding a number of tests for db_tools
[ticket/9892] Table prefix lengths influence index lengths in db_tools
[ticket/9892] Shorten the index names on the q&a captcha
[ticket/9892] column & index name limits, firebird auto increment in db_tools
Conflicts:
phpBB/develop/create_schema_files.php
Diffstat (limited to 'phpBB/includes/auth')
| -rw-r--r-- | phpBB/includes/auth/auth_db.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php index a43598cadd..f715a11971 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 count + $sql = 'SELECT COUNT(attempt_id) AS attempts FROM ' . LOGIN_ATTEMPT_TABLE . ' WHERE attempt_time > ' . (time() - (int) $config['ip_login_limit_time']); if ($config['ip_login_limit_use_forwarded']) @@ -86,7 +86,7 @@ function login_db($username, $password, $ip = '', $browser = '', $forwarded_for } $result = $db->sql_query($sql); - $attempts = (int) $db->sql_fetchfield('count'); + $attempts = (int) $db->sql_fetchfield('attempts'); $db->sql_freeresult($result); $attempt_data = array( |