From e6d3ed55296a58db143ced87c58e6c4f95c31ae4 Mon Sep 17 00:00:00 2001
From: Wardormeur <wardormeur@gmail.com>
Date: Sun, 8 Nov 2015 12:16:41 +0100
Subject: [PATCH] [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
---
 phpBB/includes/functions_user.php | 25 +++++++++++++------------
 1 file 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);