diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 16:25:08 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 16:25:08 +0200 |
| commit | 669618b5a008f157a0974bb5600a180057688884 (patch) | |
| tree | 0fe6e27b17244f1125a32670dec76d9be1451ad5 /phpBB | |
| parent | 50bf3411d422630258cd89ddcda52e2e6786a050 (diff) | |
| parent | fb3073029f5eea2859ac290663415ac5319c6334 (diff) | |
| download | forums-669618b5a008f157a0974bb5600a180057688884.tar forums-669618b5a008f157a0974bb5600a180057688884.tar.gz forums-669618b5a008f157a0974bb5600a180057688884.tar.bz2 forums-669618b5a008f157a0974bb5600a180057688884.tar.xz forums-669618b5a008f157a0974bb5600a180057688884.zip | |
Merge pull request #3979 from prototech/ticket/9153
[ticket/9153] Allow users without u_sendpm permission to delete existing PM's
* prototech/ticket/9153:
[ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm.php | 2 |
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( |