mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-05 07:07:51 +02:00
Merge branch '3.2.x'
This commit is contained in:
commit
79745e5904
@ -1269,7 +1269,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
|
||||
function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove_g, $add_to, $add_bcc)
|
||||
{
|
||||
global $auth, $db, $user;
|
||||
global $request;
|
||||
global $request, $phpbb_dispatcher;
|
||||
|
||||
// Delete User [TO/BCC]
|
||||
if ($remove_u && $request->variable('remove_u', array(0 => '')))
|
||||
@ -1446,6 +1446,21 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
|
||||
$error[] = $user->lang['PM_USERS_REMOVED_NO_PERMISSION'];
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Event for additional message list actions
|
||||
*
|
||||
* @event core.message_list_actions
|
||||
* @var array address_list The assoc array with the recipient user/group ids
|
||||
* @var array error The array containing error data
|
||||
* @var bool remove_u The variable for removing a user
|
||||
* @var bool remove_g The variable for removing a group
|
||||
* @var bool add_to The variable for adding a user to the [TO] field
|
||||
* @var bool add_bcc The variable for adding a user to the [BCC] field
|
||||
* @since 3.2.4-RC1
|
||||
*/
|
||||
$vars = array('address_list', 'error', 'remove_u', 'remove_g', 'add_to', 'add_bcc');
|
||||
extract($phpbb_dispatcher->trigger_event('core.message_list_actions', compact($vars)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user