diff options
| author | Nicofuma <github@nicofuma.fr> | 2015-03-24 23:19:46 +0100 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2015-03-24 23:19:46 +0100 |
| commit | 4a08d7457142b4d2ae4ad813cd9880e55c5f7c07 (patch) | |
| tree | 58049b19f8f8bbc2eba4c221b376c0425c6dccdf | |
| parent | 285e35992ab88fbaee137a14b538ab293f17efa6 (diff) | |
| parent | 0bc2f9f2423532f813039143d1e7a138008c58d7 (diff) | |
| download | forums-4a08d7457142b4d2ae4ad813cd9880e55c5f7c07.tar forums-4a08d7457142b4d2ae4ad813cd9880e55c5f7c07.tar.gz forums-4a08d7457142b4d2ae4ad813cd9880e55c5f7c07.tar.bz2 forums-4a08d7457142b4d2ae4ad813cd9880e55c5f7c07.tar.xz forums-4a08d7457142b4d2ae4ad813cd9880e55c5f7c07.zip | |
Merge pull request #3501 from prototech/ticket/13698
[ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.
| -rw-r--r-- | phpBB/includes/functions.php | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index acb4690a48..573df9e55d 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2920,19 +2920,6 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa // Special cases... determine switch ($result['status']) { - case LOGIN_ERROR_ATTEMPTS: - - $captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']); - $captcha->init(CONFIRM_LOGIN); - // $captcha->reset(); - - $template->assign_vars(array( - 'CAPTCHA_TEMPLATE' => $captcha->get_template(), - )); - - $err = $user->lang[$result['error_msg']]; - break; - case LOGIN_ERROR_PASSWORD_CONVERT: $err = sprintf( $user->lang[$result['error_msg']], @@ -2943,6 +2930,17 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa ); break; + case LOGIN_ERROR_ATTEMPTS: + + $captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']); + $captcha->init(CONFIRM_LOGIN); + // $captcha->reset(); + + $template->assign_vars(array( + 'CAPTCHA_TEMPLATE' => $captcha->get_template(), + )); + // no break; + // Username, password, etc... default: $err = $user->lang[$result['error_msg']]; |