mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00:00
Merge branch '3.2.x'
This commit is contained in:
commit
72799a26ea
1 changed files with 5 additions and 0 deletions
|
@ -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)
|
||||||
|
|
Loading…
Add table
Reference in a new issue