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

Merge branch '3.1.x'

Browse source 
* 3.1.x:
  [ticket/14213] Add pending to core.group_add_user_after
  [ticket/14213] Mv event group_add_user_after after cache cleaning
  [ticket/14213] Fix version number
  [ticket/14213] Adding missing reference to event dispatcher
  [ticket/14213] Adding event after users have been added to a group
This commit is contained in:
Tristan Darricau 2015-12-08 19:47:20 +01:00
commit 8ef8f49c9a
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
phpBB/includes/functions_user.php
View file

@ -2635,7 +2635,7 @@ function group_delete($group_id, $group_name = false)
*/
function group_user_add($group_id, $user_id_ary = false, $username_ary = false, $group_name = false, $default = false, $leader = 0, $pending = 0, $group_attributes = false)
{
global $db, $auth, $user, $phpbb_container, $phpbb_log;
global $db, $auth, $user, $phpbb_container, $phpbb_log, $phpbb_dispatcher;;
// We need both username and user_id info
$result = user_get_id_name($user_id_ary, $username_ary);
@ -2712,6 +2712,26 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false,
// Clear permissions cache of relevant users
$auth->acl_clear_prefetch($user_id_ary);
/**
* Event after users are added to a group
*
* @event core.group_add_user_after
* @var int group_id ID of the group to which users are added
* @var string group_name Name of the group
* @var array user_id_ary IDs of the users which are added
* @var array username_ary names of the users which are added
* @var int pending Pending setting, 1 if user(s) added are pending
* @since 3.1.7-RC1
*/
$vars = array(
'group_id',
'group_name',
'user_id_ary',
'username_ary',
'pending',
);
extract($phpbb_dispatcher->trigger_event('core.group_add_user_after', compact($vars)));
if (!$group_name)
{
$group_name = get_group_name($group_id);