makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 21:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2016-05-12 19:18:31 +02:00
commit b70b9714dd
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; 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 */ /** @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'))); $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 else
{ {
$template->assign_vars(array( $template->assign_vars(array(
'QA_CONFIRM_QUESTION' => $this->question_text, 'QA_CONFIRM_QUESTION' => $this->question_text,
'QA_CONFIRM_ID' => $this->confirm_id, 'QA_CONFIRM_ID' => $this->confirm_id,
'S_CONFIRM_CODE' => true, 'S_CONFIRM_CODE' => true,
'S_TYPE' => $this->type, 'S_TYPE' => $this->type,
)); ));
return 'captcha_qa.html'; return 'captcha_qa.html';