[Phpbb-checkins] CVS: phpBB2 privmsg.php,1.58,1.59 profile.php,1.150,1.151

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

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

Modified Files:
	privmsg.php profile.php 
Log Message:
Fix bugs #487201 & #487182

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** privmsg.php	2001/11/29 12:46:16	1.58
--- privmsg.php	2001/11/29 21:48:08	1.59
***************
*** 1271,1287 ****
  
  			$privmsg_subject = ( (strstr("Re:", $privmsg['privmsgs_subject'])) ? $lang['Re'] . ":" : "" ) . $privmsg['privmsgs_subject'];
- 			$privmsg_message = $privmsg['privmsgs_text'];
- 			$privmsg_bbcode_uid = $privmsg['privmsgs_bbcode_uid'];
  
  			$to_username = $privmsg['username'];
  			$to_userid = $privmsg['user_id'];
  
- 			$privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message);
- 			$privmsg_message = str_replace("<br />", "\n", $privmsg_message);
- 			$privmsg_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $privmsg_message);
- 
  			if( $mode == "quote" )
  			{
! 				$msg_date =  create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); //"[date]" . $privmsg['privmsgs_time'] . "[/date]";
  
  				$privmsg_message = "[quote=\"" . $to_username . "\"]\n" . $privmsg_message . "\n[/quote]";
--- 1271,1288 ----
  
  			$privmsg_subject = ( (strstr("Re:", $privmsg['privmsgs_subject'])) ? $lang['Re'] . ":" : "" ) . $privmsg['privmsgs_subject'];
  
  			$to_username = $privmsg['username'];
  			$to_userid = $privmsg['user_id'];
  
  			if( $mode == "quote" )
  			{
! 				$privmsg_message = $privmsg['privmsgs_text'];
! 				$privmsg_bbcode_uid = $privmsg['privmsgs_bbcode_uid'];
! 
! 				$privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message);
! 				$privmsg_message = str_replace("<br />", "\n", $privmsg_message);
! 				$privmsg_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $privmsg_message);
! 				
! 				$msg_date =  create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); 
  
  				$privmsg_message = "[quote=\"" . $to_username . "\"]\n" . $privmsg_message . "\n[/quote]";

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.150
retrieving revision 1.151
diff -C2 -r1.150 -r1.151
*** profile.php	2001/11/29 12:47:39	1.150
--- profile.php	2001/11/29 21:48:08	1.151
***************
*** 252,256 ****
  		{
  			$total_posts = get_db_stat("postcount");
! 			$percentage = ( $total_posts ) ? sprintf("%.2f", max(100, ($profiledata['user_posts'] / $total_posts) * 100)) : 0;
  		}
  		else
--- 252,256 ----
  		{
  			$total_posts = get_db_stat("postcount");
! 			$percentage = ( $total_posts ) ? sprintf("%.2f", min(100, ($profiledata['user_posts'] / $total_posts) * 100)) : 0;
  		}
  		else