[Phpbb-checkins] CVS: phpBB2 modcp.php,1.48,1.49

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

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

Modified Files:
	modcp.php 
Log Message:
Fixed bug #487801

Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** modcp.php	2001/11/25 03:11:50	1.48
--- modcp.php	2001/12/03 00:23:04	1.49
***************
*** 789,793 ****
  			);
  
! 			$sql = "SELECT u.username, p.*, pt.post_text, pt.post_subject, p.post_username
  				FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  				WHERE p.topic_id = $topic_id
--- 789,793 ----
  			);
  
! 			$sql = "SELECT u.username, p.*, pt.post_text, pt.bbcode_uid, pt.post_subject, p.post_username
  				FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  				WHERE p.topic_id = $topic_id
***************
*** 850,860 ****
  					}
  
! 					if( $board_config['allow_bbcode'] && $bbcode_uid != "" )
  					{
! 						$message = bbencode_second_pass($message, $bbcode_uid);
! 					}
! 					else if( !$board_config['allow_bbcode'] && $bbcode != "" )
! 					{
! 						$message = preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
  					}
  
--- 850,856 ----
  					}
  
! 					if( $bbcode_uid != "" )
  					{
! 						$message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
  					}