diff options
| author | JoshyPHP <s9e.dev@gmail.com> | 2015-06-27 04:33:43 +0200 |
|---|---|---|
| committer | JoshyPHP <s9e.dev@gmail.com> | 2015-06-27 04:34:12 +0200 |
| commit | d9db021af4c8f4913efc2bebf680da4ac8363ae2 (patch) | |
| tree | 7335453b996d59dc478869ae39903ff309d2f70e /phpBB/posting.php | |
| parent | 9e117a9eeb1958c7a8155c2e4912d4e3537f3dee (diff) | |
| parent | ae2237f640c5f08924b01e780d9549dddcb1b7da (diff) | |
| download | forums-d9db021af4c8f4913efc2bebf680da4ac8363ae2.tar forums-d9db021af4c8f4913efc2bebf680da4ac8363ae2.tar.gz forums-d9db021af4c8f4913efc2bebf680da4ac8363ae2.tar.bz2 forums-d9db021af4c8f4913efc2bebf680da4ac8363ae2.tar.xz forums-d9db021af4c8f4913efc2bebf680da4ac8363ae2.zip | |
[ticket/13880] Merge branch 'ticket/13880' into ticket/13880-fix-master
PHPBB3-13880
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 |