aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/auth
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-11-21 22:52:24 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-11-21 22:52:24 +0100
commitc98cceaf22bc9bb2396fc3682dc78cfec76dfd65 (patch)
treeda718077da25fb6b25f282873663f7fa7c512f50 /phpBB/phpbb/auth
parentdd7e09d0924819b0233d3ed79d837cdcfad923f0 (diff)
parent086883167507ced565fa2803f10a3b3ae6664595 (diff)
downloadforums-c98cceaf22bc9bb2396fc3682dc78cfec76dfd65.tar
forums-c98cceaf22bc9bb2396fc3682dc78cfec76dfd65.tar.gz
forums-c98cceaf22bc9bb2396fc3682dc78cfec76dfd65.tar.bz2
forums-c98cceaf22bc9bb2396fc3682dc78cfec76dfd65.tar.xz
forums-c98cceaf22bc9bb2396fc3682dc78cfec76dfd65.zip
Merge pull request #3068 from marc1706/ticket/13204
[ticket/13204] Tell user that password was incorrect when exceeding attempts
Diffstat (limited to 'phpBB/phpbb/auth')
-rw-r--r--phpBB/phpbb/auth/provider/db.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php
index ba67c11e75..d8c5fb72de 100644
--- a/phpBB/phpbb/auth/provider/db.php
+++ b/phpBB/phpbb/auth/provider/db.php
@@ -232,7 +232,7 @@ class db extends \phpbb\auth\provider\base
// Give status about wrong password...
return array(
'status' => ($show_captcha) ? LOGIN_ERROR_ATTEMPTS : LOGIN_ERROR_PASSWORD,
- 'error_msg' => ($show_captcha) ? 'LOGIN_ERROR_ATTEMPTS' : 'LOGIN_ERROR_PASSWORD',
+ 'error_msg' => 'LOGIN_ERROR_PASSWORD',
'user_row' => $row,
);
}