[Phpbb-checkins] CVS: phpBB2 search.php,1.69,1.70

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv2155

Modified Files:
	search.php 
Log Message:
search_id change broke various other search options, fixed

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -r1.69 -r1.70
*** search.php	31 Mar 2002 00:06:33 -0000	1.69
--- search.php	31 Mar 2002 13:47:53 -0000	1.70
***************
*** 67,71 ****
  }
  
! $search_id = ( isset($HTTP_GET_VARS['search_id']) ) ? intval($HTTP_GET_VARS['search_id']) : '';
  
  $show_results = ( isset($HTTP_POST_VARS['show_results']) ) ? $HTTP_POST_VARS['show_results'] : 'posts';
--- 67,71 ----
  }
  
! $search_id = ( isset($HTTP_GET_VARS['search_id']) ) ? $HTTP_GET_VARS['search_id'] : '';
  
  $show_results = ( isset($HTTP_POST_VARS['show_results']) ) ? $HTTP_POST_VARS['show_results'] : 'posts';
***************
*** 593,611 ****
  	else
  	{
! 		$sql = "SELECT search_array 
! 			FROM " . SEARCH_TABLE . " 
! 			WHERE search_id = $search_id  
! 				AND session_id = '". $userdata['session_id'] . "'";
! 		if ( !($result = $db->sql_query($sql)) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql);
! 		}
  
! 		if ( $row = $db->sql_fetchrow($result) )
! 		{
! 			$search_data = unserialize($row['search_array']);
! 			for($i = 0; $i < count($store_vars); $i++)
  			{
! 				$$store_vars[$i] = $search_data[$store_vars[$i]];
  			}
  		}
--- 593,614 ----
  	else
  	{
! 		if ( is_int($search_id) )
  		{
! 			$sql = "SELECT search_array 
! 				FROM " . SEARCH_TABLE . " 
! 				WHERE search_id = $search_id  
! 					AND session_id = '". $userdata['session_id'] . "'";
! 			if ( !($result = $db->sql_query($sql)) )
! 			{
! 				message_die(GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql);
! 			}
  
! 			if ( $row = $db->sql_fetchrow($result) )
  			{
! 				$search_data = unserialize($row['search_array']);
! 				for($i = 0; $i < count($store_vars); $i++)
! 				{
! 					$$store_vars[$i] = $search_data[$store_vars[$i]];
! 				}
  			}
  		}