[Phpbb-checkins] CVS: phpBB2 search.php,1.43,1.44 viewtopic.php,1.146,1.147

[Nathan C. <na...@us...>]

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

Modified Files:
	search.php viewtopic.php 
Log Message:
bug #489842 -- some pages were doing bbencode_second and make_click in a bad order.

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** search.php	2001/12/11 08:43:04	1.43
--- search.php	2001/12/11 09:13:03	1.44
***************
*** 910,914 ****
  						$user_sig_bbcode_uid = $searchset[$i]['user_sig_bbcode_uid'];
  
! 						$message = make_clickable($message);
  
  						if( count($search_string) )
--- 910,914 ----
  						$user_sig_bbcode_uid = $searchset[$i]['user_sig_bbcode_uid'];
  
! 						
  
  						if( count($search_string) )
***************
*** 942,947 ****
  						if( $searchset[$i]['enable_sig'] )
  						{
! 							$message .= "<br /><br />_________________<br />" . make_clickable($user_sig);
  						}
  					}
  
--- 942,949 ----
  						if( $searchset[$i]['enable_sig'] )
  						{
! 							$message .= "<br /><br />_________________<br />" . $user_sig;
  						}
+ 						
+ 						$message = make_clickable($message);
  					}
  

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -r1.146 -r1.147
*** viewtopic.php	2001/12/11 08:43:04	1.146
--- viewtopic.php	2001/12/11 09:13:03	1.147
***************
*** 938,942 ****
  	// output
  	//
- 	$message = make_clickable($message);
  
  	//
--- 938,941 ----
***************
*** 986,992 ****
  	if( $postrow[$i]['enable_sig'] && $user_sig != "" )
  	{
! 		$message .= "<br /><br />_________________<br />" . make_clickable($user_sig);
  	}
  
  	//
  	// Replace naughty words
--- 985,993 ----
  	if( $postrow[$i]['enable_sig'] && $user_sig != "" )
  	{
! 		$message .= "<br /><br />_________________<br />" . $user_sig;
  	}
  
+ 	$message = make_clickable($message);
+ 	
  	//
  	// Replace naughty words