diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2013-08-01 10:03:04 +0100 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2013-08-01 10:03:04 +0100 |
| commit | c2aff70cf561c1787be6cdaa193432d0cbdf432d (patch) | |
| tree | 800cf0dcba807608020042601b67699f02b73689 /phpBB/includes/ucp/ucp_pm_viewmessage.php | |
| parent | 43b172c8aabbfbcc5180a3f3ad5daede45fcc041 (diff) | |
| download | forums-c2aff70cf561c1787be6cdaa193432d0cbdf432d.tar forums-c2aff70cf561c1787be6cdaa193432d0cbdf432d.tar.gz forums-c2aff70cf561c1787be6cdaa193432d0cbdf432d.tar.bz2 forums-c2aff70cf561c1787be6cdaa193432d0cbdf432d.tar.xz forums-c2aff70cf561c1787be6cdaa193432d0cbdf432d.zip | |
[ticket/11655] Use $parse_flags
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11655
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_viewmessage.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 52a28e3552..8e7ae49fa4 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -76,7 +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 = 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); + $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']); |