aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorBruno Ais <brunoaiss@gmail.com>2013-08-01 10:07:58 +0100
committerBruno Ais <brunoaiss@gmail.com>2013-08-01 10:07:58 +0100
commit776773522ba129c0e7d0918b2f6beccd4c044dbe (patch)
treed73af967cea2f383f960869132472995a6db3d38 /phpBB/includes
parentd183431894b85ca2ebc778ccb8fd52ecf91082fb (diff)
downloadforums-776773522ba129c0e7d0918b2f6beccd4c044dbe.tar
forums-776773522ba129c0e7d0918b2f6beccd4c044dbe.tar.gz
forums-776773522ba129c0e7d0918b2f6beccd4c044dbe.tar.bz2
forums-776773522ba129c0e7d0918b2f6beccd4c044dbe.tar.xz
forums-776773522ba129c0e7d0918b2f6beccd4c044dbe.zip
[ticket/11653] Use $parse_flags
sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/mcp/mcp_topic.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 3491f37bcb..5014879b02 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -213,7 +213,8 @@ function mcp_topic_view($id, $mode, $action)
$message = $row['post_text'];
$post_subject = ($row['post_subject'] != '') ? $row['post_subject'] : $topic_info['topic_title'];
- $message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, false);
+ $parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
+ $message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags, false);
if (!empty($attachments[$row['post_id']]))
{