diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2013-07-19 18:27:25 +0100 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2013-07-19 18:27:25 +0100 |
| commit | ef7a7cac6dc3f313960a70462b084fbeaff9d4bd (patch) | |
| tree | e507803781020645dc7d169dd01ae8bb433ed9bd | |
| parent | b5651c0289054f2f4453806200506968241f9a82 (diff) | |
| download | forums-ef7a7cac6dc3f313960a70462b084fbeaff9d4bd.tar forums-ef7a7cac6dc3f313960a70462b084fbeaff9d4bd.tar.gz forums-ef7a7cac6dc3f313960a70462b084fbeaff9d4bd.tar.bz2 forums-ef7a7cac6dc3f313960a70462b084fbeaff9d4bd.tar.xz forums-ef7a7cac6dc3f313960a70462b084fbeaff9d4bd.zip | |
[ticket/11655] generate_text_for_display on ucp_pm_viewmessage.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11655
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index b7d2dd6821..0a8a3d55ab 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -76,17 +76,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) $user_info = get_user_information($author_id, $message_row); // Parse the message and subject - $message = censor_text($message_row['message_text']); - - // Second parse bbcode here - if ($message_row['bbcode_bitfield']) - { - $bbcode->bbcode_second_pass($message, $message_row['bbcode_uid'], $message_row['bbcode_bitfield']); - } - - // Always process smilies after parsing bbcodes - $message = bbcode_nl2br($message); - $message = smiley_text($message); + $message = generate_text_for_display($message_row['message_text'], $message_row['bbcode_uid'], $message_row['bbcode_bitfield'], ($message_row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true); // Replace naughty words such as farty pants $message_row['message_subject'] = censor_text($message_row['message_subject']); @@ -160,21 +150,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) // End signature parsing, only if needed if ($signature) { - $signature = censor_text($signature); - - if ($user_info['user_sig_bbcode_bitfield']) - { - if ($bbcode === false) - { - include($phpbb_root_path . 'includes/bbcode.' . $phpEx); - $bbcode = new bbcode($user_info['user_sig_bbcode_bitfield']); - } - - $bbcode->bbcode_second_pass($signature, $user_info['user_sig_bbcode_uid'], $user_info['user_sig_bbcode_bitfield']); - } - - $signature = bbcode_nl2br($signature); - $signature = smiley_text($signature); + $signature = generate_text_for_display($signature, $user_info['bbcode_uid'], $user_info['bbcode_bitfield'], ($user_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true); } $url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm'); |