mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 21:56:39 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Máté Bartus
2017-09-09 17:11:03 +02:00
parent 3e18766fd6 9ebe4da725
commit 72799a26ea
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/phpbb/textformatter/s9e/factory.php
View File

@ -273,6 +273,11 @@ class factory implements \phpbb\textformatter\cache_interface
{ {
$configurator->BBCodes->addCustom($bbcode['usage'], $bbcode['template']); $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 // Modify the template to disable images/flash depending on user's settings
foreach (array('FLASH', 'IMG') as $name) foreach (array('FLASH', 'IMG') as $name)