git-svn-id: file:///svn/phpbb/trunk@7107 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-03-02 19:24:18 +00:00
parent fed2956ed6
commit 1e578bf79a

View file

@ -176,7 +176,7 @@ class bbcode
'[/quote:$uid]' => $this->bbcode_tpl('quote_close', $bbcode_id) '[/quote:$uid]' => $this->bbcode_tpl('quote_close', $bbcode_id)
), ),
'preg' => array( '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; break;
@ -523,9 +523,9 @@ class bbcode
$username = str_replace('\"', '"', $username); $username = str_replace('\"', '"', $username);
// remove newline at the beginning // 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; $quote = (($username) ? str_replace('$1', $username, $this->bbcode_tpl('quote_username_open')) : $this->bbcode_tpl('quote_open')) . $quote;