diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2013-07-15 20:06:54 +0100 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2013-07-15 20:06:54 +0100 |
| commit | f96f2a9e23b41106c6a8ed71ad3538141c648c2f (patch) | |
| tree | 3f71c49f9da20ef50c43441f20f2b5b4d87a8550 /phpBB/includes/functions_posting.php | |
| parent | b5651c0289054f2f4453806200506968241f9a82 (diff) | |
| download | forums-f96f2a9e23b41106c6a8ed71ad3538141c648c2f.tar forums-f96f2a9e23b41106c6a8ed71ad3538141c648c2f.tar.gz forums-f96f2a9e23b41106c6a8ed71ad3538141c648c2f.tar.bz2 forums-f96f2a9e23b41106c6a8ed71ad3538141c648c2f.tar.xz forums-f96f2a9e23b41106c6a8ed71ad3538141c648c2f.zip | |
[ticket/11639] generate_text_for_display on functions_posting.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11639
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index b9b518ad32..d277ef06a3 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1104,14 +1104,12 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id $decoded_message = bbcode_nl2br($decoded_message); } - - if ($row['bbcode_bitfield']) - { - $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); - } - - $message = bbcode_nl2br($message); - $message = smiley_text($message, !$row['enable_smilies']); + $parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0); + $parse_flags |= ($row['enable_smilies'] ? OPTION_FLAG_SMILIES : 0); + + $message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags , false); + + unset($parse_flags); if (!empty($attachments[$row['post_id']])) { |