diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-29 07:29:25 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-29 07:29:25 -0700 |
| commit | 8cc272570341857f4b0f649433b2f6ba956d7e59 (patch) | |
| tree | cc6da568efc6dcebddddbbe88de2e10f5ec1d687 /phpBB/includes | |
| parent | 7003f98d037f0ff79c43bad6c24e65bb9af7c03a (diff) | |
| parent | 580131b5c316925107d1c8bed586b1c6044f4c6e (diff) | |
| download | forums-8cc272570341857f4b0f649433b2f6ba956d7e59.tar forums-8cc272570341857f4b0f649433b2f6ba956d7e59.tar.gz forums-8cc272570341857f4b0f649433b2f6ba956d7e59.tar.bz2 forums-8cc272570341857f4b0f649433b2f6ba956d7e59.tar.xz forums-8cc272570341857f4b0f649433b2f6ba956d7e59.zip | |
Merge pull request #1576 from brunoais/ticket/11640
[ticket/11640] generate_text_for_display on functions_privmsgs.php
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 14278a2529..15907feedd 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -2018,14 +2018,11 @@ 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); $subject = censor_text($subject); |