[Phpbb-checkins] r9998 - in /branches/phpBB-3_0_0/phpBB: includes/captcha/plugins/phpbb_captcha_qa_plugin.php posting.php

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

Author: Kellanved
Date: Sun Aug 16 22:11:17 2009
New Revision: 9998

Log:
erm, on the contrary; can that reset call

Modified:
    branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
    branches/phpBB-3_0_0/phpBB/posting.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:11:17 2009
***************
*** 354,360 ****
  		if (strlen($error))
  		{
  			// okay, incorrect answer. Let's ask a new question.
! 			// $this->new_attempt();
  			$this->solved = false;
  			return $error;
  		}
--- 354,360 ----
  		if (strlen($error))
  		{
  			// okay, incorrect answer. Let's ask a new question.
! 			$this->new_attempt();
  			$this->solved = false;
  			return $error;
  		}

Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Sun Aug 16 22:11:17 2009
***************
*** 1121,1131 ****
  			// The last parameter tells submit_post if search indexer has to be run
  			$redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message, ($update_message || $update_subject) ? true : false);
  
- 			if ($config['enable_post_confirm'] && !$user->data['is_registered'] && in_array($mode, array('quote', 'post', 'reply')))
- 			{
- 				$captcha->reset();
- 			}
- 
  			// Check the permissions for post approval. Moderators are not affected.
  			if (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id']))
  			{
--- 1121,1126 ----
***************
*** 1369,1375 ****
  // Posting uses is_solved for legacy reasons. Plugins have to use is_solved to force themselves to be displayed.
  if ($config['enable_post_confirm'] && !$user->data['is_registered'] && (isset($captcha) && $captcha->is_solved() === false) && ($mode == 'post' || $mode == 'reply' || $mode == 'quote'))
  {
- 	$captcha->reset();
  
  	$template->assign_vars(array(
  		'S_CONFIRM_CODE'			=> true,
--- 1364,1369 ----