diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-06-29 11:33:20 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-06-29 11:33:20 +0200 |
| commit | e4696318bd7509488d48c939edd6ff2c328d32bb (patch) | |
| tree | 68205c5603b4fb7ca572b61c06e856ff5afb8780 /phpBB/posting.php | |
| parent | 385a0bb790e82776610fd62a5ad433ea10e93b42 (diff) | |
| parent | d9db021af4c8f4913efc2bebf680da4ac8363ae2 (diff) | |
| download | forums-e4696318bd7509488d48c939edd6ff2c328d32bb.tar forums-e4696318bd7509488d48c939edd6ff2c328d32bb.tar.gz forums-e4696318bd7509488d48c939edd6ff2c328d32bb.tar.bz2 forums-e4696318bd7509488d48c939edd6ff2c328d32bb.tar.xz forums-e4696318bd7509488d48c939edd6ff2c328d32bb.zip | |
Merge pull request #3689 from s9e/ticket/13880-fix-master
[ticket/13880] Merge branch 'fix-3.1' into fix-master
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 2f9beefcf9..121cf3a904 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1586,13 +1586,12 @@ if (!sizeof($error) && $preview) // Remove quotes that would become nested too deep before decoding the text $generate_quote = ($mode == 'quote' && !$submit && !$preview && !$refresh); -if ($generate_quote && $config['max_quote_depth'] > 0 && preg_match('#^<[rt][ >]#', $message_parser->message)) +if ($generate_quote && $config['max_quote_depth'] > 0) { - $message_parser->message = $phpbb_container->get('text_formatter.utils')->remove_bbcode( - $message_parser->message, - 'quote', - $config['max_quote_depth'] - 1 - ); + $tmp_bbcode_uid = $message_parser->bbcode_uid; + $message_parser->bbcode_uid = $post_data['bbcode_uid']; + $message_parser->remove_nested_quotes($config['max_quote_depth'] - 1); + $message_parser->bbcode_uid = $tmp_bbcode_uid; } // Decode text for message display |