diff options
author | Wardormeur <wardormeur@gmail.com> | 2015-11-08 12:16:41 +0100 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2015-12-07 22:35:08 +0100 |
commit | e6d3ed55296a58db143ced87c58e6c4f95c31ae4 (patch) | |
tree | cd6f25184cf568c8926a4b7fcbce3ed38c62cfd9 /phpBB/includes/functions_user.php | |
parent | ffbc2d02d7920b093eeb852c41a82bf2c5b1bb21 (diff) | |
download | forums-e6d3ed55296a58db143ced87c58e6c4f95c31ae4.tar forums-e6d3ed55296a58db143ced87c58e6c4f95c31ae4.tar.gz forums-e6d3ed55296a58db143ced87c58e6c4f95c31ae4.tar.bz2 forums-e6d3ed55296a58db143ced87c58e6c4f95c31ae4.tar.xz forums-e6d3ed55296a58db143ced87c58e6c4f95c31ae4.zip |
[ticket/14213] Mv event group_add_user_after after cache cleaning
In order to match with the rest of the event and to have appropriate info state
PHPBB3-14213
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r-- | phpBB/includes/functions_user.php | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index b702deba55..32205fb2e7 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2754,18 +2754,6 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false, } $db->sql_multi_insert(USER_GROUP_TABLE, $sql_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 - * @since 3.1.7-RC1 - */ - $vars = array('group_id', 'group_name', 'user_id_ary', 'username_ary'); - extract($phpbb_dispatcher->trigger_event('core.group_add_user_after', compact($vars))); } if (sizeof($update_id_ary)) @@ -2787,6 +2775,19 @@ 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 + * @since 3.1.7-RC1 + */ + $vars = array('group_id', 'group_name', 'user_id_ary', 'username_ary'); + extract($phpbb_dispatcher->trigger_event('core.group_add_user_after', compact($vars))); + if (!$group_name) { $group_name = get_group_name($group_id); |