[Phpbb-checkins] r9997 - /branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php

[Henry S. <kel...@ph...>]

Author: Kellanved
Date: Sun Aug 16 22:07:11 2009
New Revision: 9997

Log:
don't pick a new question without an explicit reset call

Modified:
    branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php

Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Sun Aug 16 22:07:11 2009
***************
*** 354,360 ****
  		if (strlen($error))
  		{
  			// okay, incorrect answer. Let's ask a new question.
! 			$this->new_attempt();
  			return $error;
  		}
  		else
--- 354,361 ----
  		if (strlen($error))
  		{
  			// okay, incorrect answer. Let's ask a new question.
! 			// $this->new_attempt();
! 			$this->solved = false;
  			return $error;
  		}
  		else
***************
*** 433,439 ****
  	function load_answer()
  	{
  		global $db, $user;
! 
  		$sql = 'SELECT con.question_id, attempts, question_text, strict
  			FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' con, ' . CAPTCHA_QUESTIONS_TABLE . " qes 
  			WHERE con.question_id = qes.question_id
--- 434,440 ----
  	function load_answer()
  	{
  		global $db, $user;
! 		
  		$sql = 'SELECT con.question_id, attempts, question_text, strict
  			FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' con, ' . CAPTCHA_QUESTIONS_TABLE . " qes 
  			WHERE con.question_id = qes.question_id