aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2009-12-11 22:27:00 +0000
committerChris Smith <toonarmy@phpbb.com>2009-12-11 22:27:00 +0000
commitf150bb82819349d2bea5b8bd042e078acbe424d9 (patch)
treebade0120e28f4c505e44b8d140baede9ea441418 /phpBB/includes/ucp/ucp_pm_viewfolder.php
parent#54855 (diff)
downloadphpbb-f150bb82819349d2bea5b8bd042e078acbe424d9.tar.gz
phpbb-f150bb82819349d2bea5b8bd042e078acbe424d9.tar.bz2
phpbb-f150bb82819349d2bea5b8bd042e078acbe424d9.zip
Do not permit unauthorised users to delete private messages from folder listing. #54355
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10322 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_viewfolder.php')
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewfolder.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php
index 33d2c9fb6f..06852db591 100644
--- a/phpBB/includes/ucp/ucp_pm_viewfolder.php
+++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php
@@ -65,6 +65,12 @@ function view_folder($id, $mode, $folder_id, $folder)
$mark_options = array('mark_important', 'delete_marked');
+ // Minimise edits
+ if (!$auth->acl_get('u_pm_delete') && $key = array_search('delete_marked', $mark_options))
+ {
+ unset($mark_options[$key]);
+ }
+
$s_mark_options = '';
foreach ($mark_options as $mark_option)
{