Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2016-04-03 10:28:19 +02:00
commit 0eefec86a5

View file

@ -226,6 +226,11 @@ class bbcode
),
'preg' => array(
'#\[quote(?:="(.*?)")?:$uid\]((?!\[quote(?:=".*?")?:$uid\]).)?#is' => function ($match) {
if (!isset($match[2]))
{
$match[2] = '';
}
return $this->bbcode_second_pass_quote($match[1], $match[2]);
},
)