diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-12-03 01:40:38 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-12-03 01:40:38 +0100 |
| commit | b86289fdd358a560e8e19da072c352c65bb44849 (patch) | |
| tree | f5611ffc6577406531a6fa51112530a9758e2b75 /phpBB | |
| parent | 59d4e905ba647c13c52368714e658964e698a2de (diff) | |
| parent | 217e77d16be62baf6d9a43c311d5b52d700cfa52 (diff) | |
| download | forums-b86289fdd358a560e8e19da072c352c65bb44849.tar forums-b86289fdd358a560e8e19da072c352c65bb44849.tar.gz forums-b86289fdd358a560e8e19da072c352c65bb44849.tar.bz2 forums-b86289fdd358a560e8e19da072c352c65bb44849.tar.xz forums-b86289fdd358a560e8e19da072c352c65bb44849.zip | |
Merge branch 'ticket/igorw/9910' into develop-olympus
* ticket/igorw/9910:
[ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 16700c490c..b91636a9c8 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -172,6 +172,8 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) // Number of "to" recipients $num_recipients = (int) preg_match_all('/:?(u|g)_([0-9]+):?/', $message_row['to_address'], $match); + $bbcode_status = ($config['allow_bbcode'] && $config['auth_bbcode_pm'] && $auth->acl_get('u_pm_bbcode')) ? true : false; + $template->assign_vars(array( 'MESSAGE_AUTHOR_FULL' => get_username_string('full', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']), 'MESSAGE_AUTHOR_COLOUR' => get_username_string('colour', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']), @@ -229,6 +231,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) 'S_AUTHOR_DELETED' => ($author_id == ANONYMOUS) ? true : false, 'S_SPECIAL_FOLDER' => in_array($folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX)), 'S_PM_RECIPIENTS' => $num_recipients, + 'S_BBCODE_ALLOWED' => ($bbcode_status) ? 1 : 0, 'U_PRINT_PM' => ($config['print_pm'] && $auth->acl_get('u_pm_printpm')) ? "$url&f=$folder_id&p=" . $message_row['msg_id'] . "&view=print" : '', 'U_FORWARD_PM' => ($config['forward_pm'] && $auth->acl_get('u_sendpm') && $auth->acl_get('u_pm_forward')) ? "$url&mode=compose&action=forward&f=$folder_id&p=" . $message_row['msg_id'] : '') |