aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMáté Bartus <mate.bartus@gmail.com>2017-09-09 17:10:43 +0200
committerMáté Bartus <mate.bartus@gmail.com>2017-09-09 17:10:43 +0200
commit9ebe4da72513ad6f96fb0504b818780e42cfb09a (patch)
treeb19cb159ec83a23ac4b9b2c658bf55ae01356a8c /phpBB
parente465af28d11d97b4a48efb2dc9bb277921b63def (diff)
parente1e94683bdc57430b2205ae4b1f1b32e7d0c66e2 (diff)
downloadforums-9ebe4da72513ad6f96fb0504b818780e42cfb09a.tar
forums-9ebe4da72513ad6f96fb0504b818780e42cfb09a.tar.gz
forums-9ebe4da72513ad6f96fb0504b818780e42cfb09a.tar.bz2
forums-9ebe4da72513ad6f96fb0504b818780e42cfb09a.tar.xz
forums-9ebe4da72513ad6f96fb0504b818780e42cfb09a.zip
Merge pull request #4885 from JoshyPHP/ticket/15301
[ticket/15301] Set quotes' nesting limit when configuring a parser
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/textformatter/s9e/factory.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index b3616a3063..238483ab58 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -273,6 +273,11 @@ class factory implements \phpbb\textformatter\cache_interface
{
$configurator->BBCodes->addCustom($bbcode['usage'], $bbcode['template']);
}
+ if (isset($configurator->tags['QUOTE']))
+ {
+ // Remove the nesting limit and let other services remove quotes at parsing time
+ $configurator->tags['QUOTE']->nestingLimit = PHP_INT_MAX;
+ }
// Modify the template to disable images/flash depending on user's settings
foreach (array('FLASH', 'IMG') as $name)