diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-04-03 16:34:43 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-04-03 16:34:43 +0200 |
| commit | a319d58d036e605673c1d37e24d73fbf5dab3879 (patch) | |
| tree | 43760c8ae5c5637dd2127f1e40de2f430bf51c22 | |
| parent | f929db619007f7a386d59b40e62283f081bc26ca (diff) | |
| parent | d0f5b39f117376a037bdeabc91f32c1d5436d99b (diff) | |
| download | forums-a319d58d036e605673c1d37e24d73fbf5dab3879.tar forums-a319d58d036e605673c1d37e24d73fbf5dab3879.tar.gz forums-a319d58d036e605673c1d37e24d73fbf5dab3879.tar.bz2 forums-a319d58d036e605673c1d37e24d73fbf5dab3879.tar.xz forums-a319d58d036e605673c1d37e24d73fbf5dab3879.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14559] Remove attachment BBCode tags from the quoted message
| -rw-r--r-- | phpBB/posting.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 9bd4acf99b..4986909148 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1593,6 +1593,9 @@ $message_parser->decode_message($post_data['bbcode_uid']); if ($generate_quote) { + // Remove attachment bbcode tags from the quoted message to avoid mixing with the new post attachments if any + $message_parser->message = preg_replace('#\[attachment=([0-9]+)\](.*?)\[\/attachment\]#uis', '\\2', $message_parser->message); + if ($config['allow_bbcode']) { $message_parser->message = $phpbb_container->get('text_formatter.utils')->generate_quote( |