diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-04-03 10:27:46 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-04-03 10:27:46 +0200 |
| commit | 3281826a5155f50a38d8534de6956e07d9e1b72d (patch) | |
| tree | 50919cc5a5b9f2a180ad1ce87448eeb75c029d5f | |
| parent | 9dad16c5a6835102a1bc03f3df74abbe8aa9d4fa (diff) | |
| parent | 2505aaa9d677e1cb86684500b5f1ae9b04aae0f6 (diff) | |
| download | forums-3281826a5155f50a38d8534de6956e07d9e1b72d.tar forums-3281826a5155f50a38d8534de6956e07d9e1b72d.tar.gz forums-3281826a5155f50a38d8534de6956e07d9e1b72d.tar.bz2 forums-3281826a5155f50a38d8534de6956e07d9e1b72d.tar.xz forums-3281826a5155f50a38d8534de6956e07d9e1b72d.zip | |
Merge branch 'ticket/14426' into 3.2.x
| -rw-r--r-- | phpBB/includes/bbcode.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index e8969e552e..4b2aa90ebc 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -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]); }, ) |