diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2013-07-16 20:25:08 +0100 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2013-07-16 20:32:57 +0100 |
| commit | fc6bed28566590c26fab5845a6b94cf9b795e4da (patch) | |
| tree | 533396a7846274624111f8acca21c6d4f15bec92 /phpBB/includes/functions_privmsgs.php | |
| parent | b5651c0289054f2f4453806200506968241f9a82 (diff) | |
| download | forums-fc6bed28566590c26fab5845a6b94cf9b795e4da.tar forums-fc6bed28566590c26fab5845a6b94cf9b795e4da.tar.gz forums-fc6bed28566590c26fab5845a6b94cf9b795e4da.tar.bz2 forums-fc6bed28566590c26fab5845a6b94cf9b795e4da.tar.xz forums-fc6bed28566590c26fab5845a6b94cf9b795e4da.zip | |
[ticket/11640] generate_text_for_display on functions_privmsgs.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11640
Diffstat (limited to 'phpBB/includes/functions_privmsgs.php')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 14278a2529..001cf7bba0 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -2018,14 +2018,12 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode $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); $subject = censor_text($subject); |