diff options
| author | Nicofuma <github@nicofuma.fr> | 2015-03-24 23:20:03 +0100 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2015-03-24 23:20:03 +0100 |
| commit | 9a5aefd4c20da2dcfb17f9a1b447728a6bcef423 (patch) | |
| tree | 6d7704165605e74f7fd36ebeed77d4e9d88d6c78 | |
| parent | 673435a0fc1f1f59687b99c980e1b0852c68793a (diff) | |
| parent | 4a08d7457142b4d2ae4ad813cd9880e55c5f7c07 (diff) | |
| download | forums-9a5aefd4c20da2dcfb17f9a1b447728a6bcef423.tar forums-9a5aefd4c20da2dcfb17f9a1b447728a6bcef423.tar.gz forums-9a5aefd4c20da2dcfb17f9a1b447728a6bcef423.tar.bz2 forums-9a5aefd4c20da2dcfb17f9a1b447728a6bcef423.tar.xz forums-9a5aefd4c20da2dcfb17f9a1b447728a6bcef423.zip | |
Merge branch '3.1.x'
| -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 2514dd48d5..949d33c566 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2793,19 +2793,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']], @@ -2816,6 +2803,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']]; |