diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-21 22:52:29 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-21 22:52:29 +0100 |
| commit | 655cd3bd3a826beced340555a87a2eb13d464606 (patch) | |
| tree | 375d36b939b61615ca3d351b3494a59ec298023c | |
| parent | 9b54f2d0c49019c1ccb338ca2848b699cf2573ba (diff) | |
| parent | c98cceaf22bc9bb2396fc3682dc78cfec76dfd65 (diff) | |
| download | forums-655cd3bd3a826beced340555a87a2eb13d464606.tar forums-655cd3bd3a826beced340555a87a2eb13d464606.tar.gz forums-655cd3bd3a826beced340555a87a2eb13d464606.tar.bz2 forums-655cd3bd3a826beced340555a87a2eb13d464606.tar.xz forums-655cd3bd3a826beced340555a87a2eb13d464606.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | phpBB/phpbb/auth/provider/db.php | 2 |
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, ); } |