aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
diff options
context:
space:
mode:
authorBruno Ais <brunoaiss@gmail.com>2013-07-24 12:31:38 +0100
committerBruno Ais <brunoaiss@gmail.com>2013-07-24 12:31:38 +0100
commit6c68348a71891219b039ae98a5a0af2fd52d3956 (patch)
treee5f6cedc76638d2abfa6a8c608b979c03258bebf /phpBB/viewtopic.php
parent029015e1542e7719d4a35d350093f4dfb3a7313e (diff)
downloadforums-6c68348a71891219b039ae98a5a0af2fd52d3956.tar
forums-6c68348a71891219b039ae98a5a0af2fd52d3956.tar.gz
forums-6c68348a71891219b039ae98a5a0af2fd52d3956.tar.bz2
forums-6c68348a71891219b039ae98a5a0af2fd52d3956.tar.xz
forums-6c68348a71891219b039ae98a5a0af2fd52d3956.zip
[ticket/11638] Use the $parse_flags like the other commits
sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11638
Diffstat (limited to 'phpBB/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index a0e7eb6a94..151176fc6f 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1386,7 +1386,8 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
}
// Parse the message and subject
- $message = generate_text_for_display($row['post_text'], $row['bbcode_uid'], $row['bbcode_bitfield'], ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
+ $parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
+ $message = generate_text_for_display($row['post_text'], $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags, true);
if (!empty($attachments[$row['post_id']]))
{