makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
* 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
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/ucp/ucp_pm.php
View file

@ -92,7 +92,7 @@ class ucp_pm
$user_folders = get_folder($user->data['user_id']); $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'); // trigger_error('NO_AUTH_SEND_MESSAGE');
$template->assign_vars(array( $template->assign_vars(array(