From c09bd8c69f6acc30f581a6cd9136c7c3a7d8f8aa Mon Sep 17 00:00:00 2001
From: David M <davidmj@users.sourceforge.net>
Date: Thu, 16 Aug 2007 19:24:32 +0000
Subject: #14132

git-svn-id: file:///svn/phpbb/trunk@8039 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/message_parser.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index c2d40670af..65ffee8dd0 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -426,10 +426,10 @@ class bbcode_firstpass extends bbcode
 				}
 
 				$code = preg_replace('#^<span class="[a-z]+"><span class="([a-z]+)">(.*)</span></span>#s', '<span class="$1">$2</span>', $code);
-				$code = preg_replace('#(?:[\n\r\s\t]|&nbsp;)*</span>$#u', '</span>', $code);
+				$code = preg_replace('#(?:\s++|&nbsp;)*+</span>$#u', '</span>', $code);
 
 				// remove newline at the end
-				if (!empty($code) && $code[strlen($code) - 1] == "\n")
+				if (!empty($code) && substr($code, -1) == "\n")
 				{
 					$code = substr($code, 0, -1);
 				}
@@ -1565,7 +1565,7 @@ class parse_message extends bbcode_firstpass
 
 		$poll['poll_option_text'] = $this->parse($poll['enable_bbcode'], ($config['allow_post_links']) ? $poll['enable_urls'] : false, $poll['enable_smilies'], $poll['img_status'], false, false, $config['allow_post_links'], false);
 
-		$this->bbcode_bitfield = base64_encode(base64_decode($bbcode_bitfield) | base64_decode($this->bbcode_bitfield));
+		$bbcode_bitfield = base64_encode(base64_decode($bbcode_bitfield) | base64_decode($this->bbcode_bitfield));
 		$this->message = $tmp_message;
 
 		// Parse Poll Title
-- 
cgit v1.2.1