diff options
| -rw-r--r-- | phpBB/includes/bbcode.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index b7f274ce35..1f4567f1e8 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -176,7 +176,7 @@ class bbcode '[/quote:$uid]' => $this->bbcode_tpl('quote_close', $bbcode_id) ), 'preg' => array( - '#\[quote(?:="(.*?)")?:$uid\](.)#ise' => "\$this->bbcode_second_pass_quote('\$1', '\$2')" + '#\[quote(?:="(.*?)")?:$uid\]((?!\[quote(?:="(.*?)")?:$uid\]).)?#ise' => "\$this->bbcode_second_pass_quote('\$1', '\$2')" ) ); break; @@ -523,9 +523,9 @@ class bbcode $username = str_replace('\"', '"', $username); // remove newline at the beginning - if ($quote[0] == "\n") + if ($quote == "\n") { - $quote = substr($quote, 1); + $quote = ''; } $quote = (($username) ? str_replace('$1', $username, $this->bbcode_tpl('quote_username_open')) : $this->bbcode_tpl('quote_open')) . $quote; |