makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source 
* 3.2.x:
  [ticket/14559] Remove attachment BBCode tags from the quoted message
This commit is contained in:
Tristan Darricau 2016-04-03 16:34:46 +02:00
commit 4ded3864cd
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/posting.php
View file

@ -1593,6 +1593,9 @@ $message_parser->decode_message($post_data['bbcode_uid']);
if ($generate_quote) 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']) if ($config['allow_bbcode'])
{ {
$message_parser->message = $phpbb_container->get('text_formatter.utils')->generate_quote( $message_parser->message = $phpbb_container->get('text_formatter.utils')->generate_quote(