diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-05-12 19:15:58 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-05-12 19:15:58 +0200 |
| commit | 734972cc3d837e7dd654407031cf85c3506d16dd (patch) | |
| tree | 58ab02665b8f01efaf921a5a99775afd40c94e19 | |
| parent | 4cdec74e94728605089587f2fd0667b3b3e4e558 (diff) | |
| parent | 03348087d8bf8794da257f6e7ac4e318dd562fc0 (diff) | |
| download | forums-734972cc3d837e7dd654407031cf85c3506d16dd.tar forums-734972cc3d837e7dd654407031cf85c3506d16dd.tar.gz forums-734972cc3d837e7dd654407031cf85c3506d16dd.tar.bz2 forums-734972cc3d837e7dd654407031cf85c3506d16dd.tar.xz forums-734972cc3d837e7dd654407031cf85c3506d16dd.zip | |
Merge pull request #4317 from rmcgirr83/ticket_14610
[ticket/14610] Don't log an error if the Q&A captcha has been solved
| -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 8f2da838c5..a9d133d8f2 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'; |