From 64aafb5ca73d329663a93f80ac9cf3e68a082866 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 21 Aug 2010 20:51:26 +0000
Subject: Merged r6534-6559 from 1.7 branch to trunk

git-svn-id: http://code.elgg.org/elgg/trunk@6840 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/groups/start.php | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'mod/groups/start.php')

diff --git a/mod/groups/start.php b/mod/groups/start.php
index 3278b6682..215311ef9 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -356,20 +356,18 @@
 	}
 
 	/**
-	 * Groups created, so add users to access lists.
+	 * Groups created so create an access list for it
 	 */
 	function groups_create_event_listener($event, $object_type, $object)
 	{
-		//if (($event == 'create') && ($object_type == 'group') && ($object instanceof ElggGroup))
-		//{
-			$group_id = create_access_collection(elgg_echo('groups:group') . ": " . $object->name);
-			if ($group_id)
-			{
-				$object->group_acl = $group_id;
-			}
-			else
-				return false;
-		//}
+		$ac_name = elgg_echo('groups:group') . ": " . $object->name;
+		$group_id = create_access_collection($ac_name, $object->guid);
+		if ($group_id) {
+			$object->group_acl = $group_id;
+		} else {
+			// delete group if access creation fails
+			return false;
+		}
 
 		return true;
 	}
@@ -459,7 +457,6 @@
 		add_user_to_access_collection($user->guid, $acl);
 
 		return true;
-
 	}
 
 	/**
@@ -475,7 +472,6 @@
 		remove_user_from_access_collection($user->guid, $acl);
 
 		return true;
-
 	}
 
 	/**
-- 
cgit v1.2.3