aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_pm_viewmessage.php
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2008-12-04 19:58:42 +0000
committerChris Smith <toonarmy@phpbb.com>2008-12-04 19:58:42 +0000
commit00d870676574b7555625f1573c73d4a22f16be38 (patch)
tree0edd462a551eb419e870df037ddf1645fc045620 /phpBB/includes/ucp/ucp_pm_viewmessage.php
parentc931ce3a54bb76543a133cef0d91984a083874ae (diff)
downloadforums-00d870676574b7555625f1573c73d4a22f16be38.tar
forums-00d870676574b7555625f1573c73d4a22f16be38.tar.gz
forums-00d870676574b7555625f1573c73d4a22f16be38.tar.bz2
forums-00d870676574b7555625f1573c73d4a22f16be38.tar.xz
forums-00d870676574b7555625f1573c73d4a22f16be38.zip
- Do not show 'Forward' button if the user cannot send PM's.
- Correct colspan on prosilver mcp_front.html. #37515 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9174 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_viewmessage.php')
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewmessage.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 45f5cf87a6..bdd0e44ea8 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -221,7 +221,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
'S_SPECIAL_FOLDER' => in_array($folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX)),
'U_PRINT_PM' => ($config['print_pm'] && $auth->acl_get('u_pm_printpm')) ? "$url&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] . "&amp;view=print" : '',
- 'U_FORWARD_PM' => ($config['forward_pm'] && $auth->acl_get('u_pm_forward')) ? "$url&amp;mode=compose&amp;action=forward&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '')
+ 'U_FORWARD_PM' => ($config['forward_pm'] && $auth->acl_get('u_sendpm') && $auth->acl_get('u_pm_forward')) ? "$url&amp;mode=compose&amp;action=forward&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '')
);
// Display not already displayed Attachments for this post, we already parsed them. ;)