diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2016-05-12 19:16:03 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-05-12 19:16:03 +0200 |
| commit | 961ffee6844b44b306fa1fb1f6e2a0e958638896 (patch) | |
| tree | fbb5403cac157f6cc49d3c52a7abe2bd8cb12939 /phpBB/phpbb/captcha | |
| parent | Merge pull request #4310 from Crizz0/ticket/14619 (diff) | |
| parent | Merge pull request #4317 from rmcgirr83/ticket_14610 (diff) | |
| download | phpbb-961ffee6844b44b306fa1fb1f6e2a0e958638896.tar.gz phpbb-961ffee6844b44b306fa1fb1f6e2a0e958638896.tar.bz2 phpbb-961ffee6844b44b306fa1fb1f6e2a0e958638896.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/phpbb/captcha')
| -rw-r--r-- | phpBB/phpbb/captcha/plugins/qa.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/phpBB/phpbb/captcha/plugins/qa.php b/phpBB/phpbb/captcha/plugins/qa.php index 7f804850a4..9d481acc5d 100644 --- a/phpBB/phpbb/captcha/plugins/qa.php +++ b/phpBB/phpbb/captcha/plugins/qa.php @@ -222,7 +222,11 @@ class qa { global $phpbb_log, $template, $user; - if ($this->is_solved() || empty($this->question_text) || !count($this->question_ids)) + if ($this->is_solved()) + { + return false; + } + else if (empty($this->question_text) || !count($this->question_ids)) { /** @var \phpbb\log\log_interface $phpbb_log */ $phpbb_log->add('critical', $user->data['user_id'], $user->ip, 'LOG_ERROR_CAPTCHA', time(), array($user->lang('CONFIRM_QUESTION_MISSING'))); @@ -231,10 +235,10 @@ class qa else { $template->assign_vars(array( - 'QA_CONFIRM_QUESTION' => $this->question_text, - 'QA_CONFIRM_ID' => $this->confirm_id, - 'S_CONFIRM_CODE' => true, - 'S_TYPE' => $this->type, + 'QA_CONFIRM_QUESTION' => $this->question_text, + 'QA_CONFIRM_ID' => $this->confirm_id, + 'S_CONFIRM_CODE' => true, + 'S_TYPE' => $this->type, )); return 'captcha_qa.html'; |