[Phpbb-checkins] r10094 - /branches/phpBB-3_0_0/phpBB/includes/functions.php

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

Author: Kellanved
Date: Thu Sep  3 14:59:31 2009
New Revision: 10094

Log:
#50675 ; also don't reset the captcha on login

Modified:
    branches/phpBB-3_0_0/phpBB/includes/functions.php

Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Thu Sep  3 14:59:31 2009
***************
*** 2082,2088 ****
  	}
  
  	$on_page = floor($start_item / $per_page) + 1;
! 	$url_delim = (strpos($base_url, '?') === false) ? '?' : '&';
  
  	$page_string = ($on_page == 1) ? '<strong>1</strong>' : '<a href="' . $base_url . '">1</a>';
  
--- 2082,2088 ----
  	}
  
  	$on_page = floor($start_item / $per_page) + 1;
! 	$url_delim = (strpos($base_url, '?') === false) ? '?' : ((strpos($base_url, '?') === strlen($base_url) - 1) ? '' : '&amp;');
  
  	$page_string = ($on_page == 1) ? '<strong>1</strong>' : '<a href="' . $base_url . '">1</a>';
  
***************
*** 2949,2955 ****
  
  				$captcha = phpbb_captcha_factory::get_instance($config['captcha_plugin']);
  				$captcha->init(CONFIRM_LOGIN);
! 				$captcha->reset();
  
  				$template->assign_vars(array(
  					'CAPTCHA_TEMPLATE'			=> $captcha->get_template(),
--- 2949,2955 ----
  
  				$captcha = phpbb_captcha_factory::get_instance($config['captcha_plugin']);
  				$captcha->init(CONFIRM_LOGIN);
! 				// $captcha->reset();
  
  				$template->assign_vars(array(
  					'CAPTCHA_TEMPLATE'			=> $captcha->get_template(),