1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

Merge branch '3.1.x'

* 3.1.x:
  [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
This commit is contained in:
Tristan Darricau 2015-10-14 16:25:15 +02:00
commit e94f9d7830

View File

@ -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(