mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 15:17:16 +01:00
Code Issues Releases Wiki Activity

Merge pull request #4317 from rmcgirr83/ticket_14610

Browse Source 
[ticket/14610] Don't log an error if the Q&A captcha has been solved
This commit is contained in:
Marc Alexander 2016-05-12 19:15:58 +02:00
commit 734972cc3d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/phpbb/captcha/plugins/qa.php
View File

@ -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';