diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-08-01 11:39:17 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-08-01 11:39:17 +0200 |
| commit | 498f6ccbfce68420a60408ce389c83a0b516e784 (patch) | |
| tree | 7d4fb73c12be64c21867660567656561a81e4385 /phpBB/includes/ucp | |
| parent | ca07be9c57d35e297204814e8c93c710bb1890dd (diff) | |
| parent | 3ae33910fc600ae86f0036370958bd7ec19e7ab9 (diff) | |
| download | forums-498f6ccbfce68420a60408ce389c83a0b516e784.tar forums-498f6ccbfce68420a60408ce389c83a0b516e784.tar.gz forums-498f6ccbfce68420a60408ce389c83a0b516e784.tar.bz2 forums-498f6ccbfce68420a60408ce389c83a0b516e784.tar.xz forums-498f6ccbfce68420a60408ce389c83a0b516e784.zip | |
Merge remote-tracking branch 'brunoais/ticket/11655' into develop
* brunoais/ticket/11655:
[ticket/11653] Use $parse_flags
[ticket/11653] Missing ";"
[ticket/11655] Use $parse_flags
[ticket/11655] wrong var names for the uid and for the bitfield
[ticket/11655] generate_text_for_display on ucp_pm_viewmessage.php
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index b7d2dd6821..c7b4489daf 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -76,17 +76,8 @@ 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); + $parse_flags = ($message_row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES; + $message = generate_text_for_display($message_row['message_text'], $message_row['bbcode_uid'], $message_row['bbcode_bitfield'], $parse_flags, true); // Replace naughty words such as farty pants $message_row['message_subject'] = censor_text($message_row['message_subject']); @@ -160,21 +151,8 @@ 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); + $parse_flags = ($user_info['user_sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES; + $signature = generate_text_for_display($signature, $user_info['user_sig_bbcode_uid'], $user_info['user_sig_bbcode_bitfield'], $parse_flags, true); } $url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm'); |