diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 16:25:15 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 16:25:15 +0200 |
| commit | e94f9d7830819c2391a10914ab3cffaebf72836e (patch) | |
| tree | 2ab2ce677345cc711a1a699dbbbb7d0f69b3a52d /phpBB/includes/ucp/ucp_pm.php | |
| parent | cd114a68e956e448df18ffbad855a12a6f597861 (diff) | |
| parent | 669618b5a008f157a0974bb5600a180057688884 (diff) | |
| download | forums-e94f9d7830819c2391a10914ab3cffaebf72836e.tar forums-e94f9d7830819c2391a10914ab3cffaebf72836e.tar.gz forums-e94f9d7830819c2391a10914ab3cffaebf72836e.tar.bz2 forums-e94f9d7830819c2391a10914ab3cffaebf72836e.tar.xz forums-e94f9d7830819c2391a10914ab3cffaebf72836e.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm.php')
| -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 5f24d05c8b..33dff97fe6 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( |