Fixed group-specific access controls, and site-specific access controls

git-svn-id: https://code.elgg.org/elgg/trunk@1720 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 4 insertions, 2 deletions

diff --git a/engine/lib/group.php b/engine/lib/group.php
index 2556001c5..5c09a93d9 100644
--- a/engine/lib/group.php
+++ b/engine/lib/group.php
@@ -765,7 +765,8 @@
 	 * @param int $user_guid The user.
 	 */
 	function join_group($group_guid, $user_guid)
-	{
+	{

+		trigger_elgg_event('join','group',array('group' => get_entity($group_guid), 'user' => get_entity($user_guid)));
 		return add_entity_relationship($user_guid, 'member', $group_guid);
 	}
 	
@@ -776,7 +777,8 @@
 	 * @param int $user_guid The user.
 	 */
 	function leave_group($group_guid, $user_guid)
-	{
+	{

+		trigger_elgg_event('leave','group',array('group' => get_entity($group_guid), 'user' => get_entity($user_guid)));
 		return remove_entity_relationship($user_guid, 'member', $group_guid);
 	}