diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-07-09 16:23:57 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-07-09 16:23:57 +0000 |
| commit | 46af817cb058e2eecd89081af4a40075426a32ef (patch) | |
| tree | d27156cb086223b91b8c67f23db969a980e1b7b8 /phpBB/ucp.php | |
| parent | 455add06f29400af3176eea7c4958ed772934460 (diff) | |
| download | forums-46af817cb058e2eecd89081af4a40075426a32ef.tar forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.gz forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.bz2 forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.xz forums-46af817cb058e2eecd89081af4a40075426a32ef.zip | |
- tackle some usability issues
- fix bug #3147
- added the lock-images made by SHS`
- fixed MSSQL errors (adding the correct ESCAPE sequence)
git-svn-id: file:///svn/phpbb/trunk@6161 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/ucp.php')
| -rwxr-xr-x | phpBB/ucp.php | 8 |
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')) ); } |