aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/auth.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-06-11 19:42:04 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-06-11 19:42:04 +0200
commitfe5d616349df911d7053c4862cc734a8de21b4fb (patch)
treef367d086f63d6077c72a51b69f9070784da21aa2 /phpBB/includes/auth.php
parent0cad4ed49f6272f029afad0fb613a8855f0a5b43 (diff)
parentbf2125f0f7c2b3d2f270ae4f3117941dd108f35a (diff)
downloadforums-fe5d616349df911d7053c4862cc734a8de21b4fb.tar
forums-fe5d616349df911d7053c4862cc734a8de21b4fb.tar.gz
forums-fe5d616349df911d7053c4862cc734a8de21b4fb.tar.bz2
forums-fe5d616349df911d7053c4862cc734a8de21b4fb.tar.xz
forums-fe5d616349df911d7053c4862cc734a8de21b4fb.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9992] Clarify explanations of ip and account limits on login [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAIN [ticket/9992] Use sql_fetchfield for single row and single column result [ticket/9992] Adding a limit on login attempts per IP. [ticket/9992] Make sql_create_table and sql_table_exists available in updater
Diffstat (limited to 'phpBB/includes/auth.php')
-rw-r--r--phpBB/includes/auth.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php
index 22aca5faf9..53b0c5ff2c 100644
--- a/phpBB/includes/auth.php
+++ b/phpBB/includes/auth.php
@@ -908,7 +908,7 @@ class auth
$method = 'login_' . $method;
if (function_exists($method))
{
- $login = $method($username, $password);
+ $login = $method($username, $password, $user->ip, $user->browser, $user->forwarded_for);
// If the auth module wants us to create an empty profile do so and then treat the status as LOGIN_SUCCESS
if ($login['status'] == LOGIN_SUCCESS_CREATE_PROFILE)