aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_pm.php
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2015-10-14 03:02:22 -0700
committerCesar G <prototech91@gmail.com>2015-10-14 03:09:06 -0700
commitfb3073029f5eea2859ac290663415ac5319c6334 (patch)
treeb0015feda3b5519fd739805b1af70de8b59f0134 /phpBB/includes/ucp/ucp_pm.php
parent3367f0036a2521c7d6ea2b3fed5d42f7b0d19611 (diff)
downloadforums-fb3073029f5eea2859ac290663415ac5319c6334.tar
forums-fb3073029f5eea2859ac290663415ac5319c6334.tar.gz
forums-fb3073029f5eea2859ac290663415ac5319c6334.tar.bz2
forums-fb3073029f5eea2859ac290663415ac5319c6334.tar.xz
forums-fb3073029f5eea2859ac290663415ac5319c6334.zip
[ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
The u_sendpm check in ucp_pm.php is merely for the purpose of displaying the error message within the UCP template. Otherwise it could be removed as compose_pm() will check the appropriate permission pertaining to the attempted action. PHPBB3-9153
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm.php')
-rw-r--r--phpBB/includes/ucp/ucp_pm.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php
index 425a56cf6c..f026cd3eb3 100644
--- a/phpBB/includes/ucp/ucp_pm.php
+++ b/phpBB/includes/ucp/ucp_pm.php
@@ -92,7 +92,7 @@ class ucp_pm
$user_folders = get_folder($user->data['user_id']);
- if (!$auth->acl_get('u_sendpm'))
+ if ($action != 'delete' && !$auth->acl_get('u_sendpm'))
{
// trigger_error('NO_AUTH_SEND_MESSAGE');
$template->assign_vars(array(