diff options
| author | Nicofuma <github@nicofuma.fr> | 2015-05-19 23:35:58 +0200 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2015-05-19 23:35:58 +0200 |
| commit | 5e6c026527077f2ea57311cfd7ca2abce331ae0b (patch) | |
| tree | fc5751ac24f842d266d6502c3fbbe783603627ff /phpBB/includes/message_parser.php | |
| parent | d7e2f488a45da99c845912925fe84d501c5d6da2 (diff) | |
| parent | 2cc78b2c3b4e918710478f861c1441a3e28c9ad4 (diff) | |
| download | forums-5e6c026527077f2ea57311cfd7ca2abce331ae0b.tar forums-5e6c026527077f2ea57311cfd7ca2abce331ae0b.tar.gz forums-5e6c026527077f2ea57311cfd7ca2abce331ae0b.tar.bz2 forums-5e6c026527077f2ea57311cfd7ca2abce331ae0b.tar.xz forums-5e6c026527077f2ea57311cfd7ca2abce331ae0b.zip | |
Merge pull request #3617 from s9e/ticket/11530
[ticket/11530] Remove extra quotes when depth limit is exceeded
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 9fe598d7fb..f018d735a7 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1250,6 +1250,16 @@ class parse_message extends bbcode_firstpass return (!$update_this_message) ? $return_message : $this->warn_msg; } + // Remove quotes that are nested too deep + if ($config['max_quote_depth'] > 0) + { + $this->message = $phpbb_container->get('text_formatter.utils')->remove_bbcode( + $this->message, + 'quote', + $config['max_quote_depth'] + ); + } + // Check for errors $errors = $parser->get_errors(); if ($errors) |