diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-08-16 19:24:32 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-08-16 19:24:32 +0000 |
| commit | c09bd8c69f6acc30f581a6cd9136c7c3a7d8f8aa (patch) | |
| tree | f6e832548c543d8a927ec8374c5462b04a7c23d0 /phpBB/includes | |
| parent | 521dfdbb059b330e34d11e0fbfa96fbf831d1d20 (diff) | |
| download | forums-c09bd8c69f6acc30f581a6cd9136c7c3a7d8f8aa.tar forums-c09bd8c69f6acc30f581a6cd9136c7c3a7d8f8aa.tar.gz forums-c09bd8c69f6acc30f581a6cd9136c7c3a7d8f8aa.tar.bz2 forums-c09bd8c69f6acc30f581a6cd9136c7c3a7d8f8aa.tar.xz forums-c09bd8c69f6acc30f581a6cd9136c7c3a7d8f8aa.zip | |
#14132
git-svn-id: file:///svn/phpbb/trunk@8039 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/message_parser.php | 6 |
1 files changed, 3 insertions, 3 deletions
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]| )*</span>$#u', '</span>', $code); + $code = preg_replace('#(?:\s++| )*+</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 |