aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Ais <brunoaiss@gmail.com>2013-08-01 10:14:34 +0100
committerBruno Ais <brunoaiss@gmail.com>2013-08-01 10:14:34 +0100
commit3ae33910fc600ae86f0036370958bd7ec19e7ab9 (patch)
treee021cd7e75de4fb32ddcdb8e38d54675439a3bf1
parentc806375828c01c011915f1438f718349aaaaf282 (diff)
downloadforums-3ae33910fc600ae86f0036370958bd7ec19e7ab9.tar
forums-3ae33910fc600ae86f0036370958bd7ec19e7ab9.tar.gz
forums-3ae33910fc600ae86f0036370958bd7ec19e7ab9.tar.bz2
forums-3ae33910fc600ae86f0036370958bd7ec19e7ab9.tar.xz
forums-3ae33910fc600ae86f0036370958bd7ec19e7ab9.zip
[ticket/11653] Use $parse_flags
sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewmessage.php3
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 79c4297858..c7b4489daf 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -151,7 +151,8 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
// End signature parsing, only if needed
if ($signature)
{
- $signature = generate_text_for_display($signature, $user_info['user_sig_bbcode_uid'], $user_info['user_sig_bbcode_bitfield'], ($user_info['user_sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
+ $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');