aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/ucp.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/ucp.php')
-rwxr-xr-xphpBB/ucp.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 87c331ed92..bf0d562dcb 100755
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -283,9 +283,9 @@ while ($row = $db->sql_fetchrow($result))
$db->sql_freeresult($result);
// Output PM_TO box if message composing
-if ($mode == 'compose' && request_var('action', '') != 'edit')
+if ($mode == 'compose' && $auth->acl_get('u_sendpm') && request_var('action', '') != 'edit')
{
- if ($config['allow_mass_pm'])
+ if ($config['allow_mass_pm'] && $auth->acl_get('u_masspm'))
{
$sql = 'SELECT group_id, group_name, group_type
FROM ' . GROUPS_TABLE . '
@@ -304,8 +304,8 @@ if ($mode == 'compose' && request_var('action', '') != 'edit')
$template->assign_vars(array(
'S_SHOW_PM_BOX' => true,
- 'S_ALLOW_MASS_PM' => ($config['allow_mass_pm']),
- 'S_GROUP_OPTIONS' => ($config['allow_mass_pm']) ? $group_options : '',
+ 'S_ALLOW_MASS_PM' => ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? true : false,
+ 'S_GROUP_OPTIONS' => ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? $group_options : '',
'U_SEARCH_USER' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=post&field=username_list'))
);
}