[Phpbb-checkins] CVS: phpBB2/includes post.php,1.9,1.10

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

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

Modified Files:
	post.php 
Log Message:
Fixes various issues inc. bugs #485538, #485323 and an incorrect conversion of some accented chars (thanks Ashe for noting it)

Index: post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/post.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** post.php	2001/09/25 18:18:47	1.9
--- post.php	2001/11/26 14:07:33	1.10
***************
*** 38,44 ****
  	if( $html_on )
  	{
! 		$html_entities_match = array("#<#", "#>#", "#& #");
! 		$html_entities_replace = array("&lt;", "&gt;", "&amp; ");
  
  		$start_html = 1;
  
--- 38,46 ----
  	if( $html_on )
  	{
! 		$html_entities_match = array("#&#", "#<#", "#>#");
! 		$html_entities_replace = array("&amp;", "&lt;", "&gt;");
  
+ 		$message = preg_replace("#&([a-z0-9]+?);#i", "&amp;\\1;", $message);
+ 
  		$start_html = 1;
  
***************
*** 82,87 ****
  	else
  	{
! 		$html_entities_match = array("#<#", "#>#", "#& #");
! 		$html_entities_replace = array("&lt;", "&gt;", "&amp; ");
  		$message = preg_replace($html_entities_match, $html_entities_replace, $message);
  	}
--- 84,89 ----
  	else
  	{
! 		$html_entities_match = array("#&#", "#<#", "#>#");
! 		$html_entities_replace = array("&amp;", "&lt;", "&gt;");
  		$message = preg_replace($html_entities_match, $html_entities_replace, $message);
  	}