[Phpbb-checkins] phpBB2/includes message_parser.php,1.159,1.160

[Meik S. <acy...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25309

Modified Files:
	message_parser.php 
Log Message:
hopefully fixed bug #5644 while also retaining the fix for bug #3572
testing this is appreciated.

Index: message_parser.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/message_parser.php,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -d -r1.159 -r1.160
*** message_parser.php	19 Nov 2006 00:41:16 -0000	1.159
--- message_parser.php	27 Nov 2006 18:00:41 -0000	1.160
***************
*** 665,676 ****
  							{
  								$end_tag = array_pop($end_tags);
! 								if ($end_tag != $tag)
! 								{
! 									$error = true;
! 								}
! 								else
! 								{
! 									$error = false;
! 								}
  							}
  						}
--- 665,669 ----
  							{
  								$end_tag = array_pop($end_tags);
! 								$error = ($end_tag != $tag) ? true : false;
  							}
  						}
***************
*** 705,711 ****
  			else
  			{
  				$out .= $buffer . $tok;
! 				// $tok = ($tok == '[') ? ']' : '[]';
! 				$tok = '[]';
  				$buffer = '';
  			}
--- 698,730 ----
  			else
  			{
+ /**
+ *				Old quote code working fine, but having errors listed in bug #3572
+ *
+ *				$out .= $buffer . $tok;
+ *				$tok = ($tok == '[') ? ']' : '[]';
+ *				$buffer = '';
+ */
+ 
  				$out .= $buffer . $tok;
! 
! 				if ($tok == '[')
! 				{
! 					// Search the text for the next tok... if an ending quote comes first, then change tok to []
! 					$pos1 = strpos($in, '[/quote');
! 					$pos2 = strpos($in, ']');
! 
! 					if ($pos1 !== false && ($pos2 === false || $pos1 < $pos2))
! 					{
! 						$tok = '[]';
! 					}
! 					else
! 					{
! 						$tok = ']';
! 					}
! 				}
! 				else
! 				{
! 					$tok = '[]';
! 				}
  				$buffer = '';
  			}