From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 26 Aug 2010 11:43:05 +0000 (+0000)
Subject: Merged [6857] into trunk
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=8862b1f0fc6a7d9d2f3668697e2f658a7e31747e;p=lorea%2Felgg.git

Merged [6857] into trunk


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

diff --git a/engine/lib/upgrades/2010062301.php b/engine/lib/upgrades/2010062301.php
index 96fd6c810..049a93440 100644
--- a/engine/lib/upgrades/2010062301.php
+++ b/engine/lib/upgrades/2010062301.php
@@ -13,8 +13,19 @@ if ($groups) {
 	foreach ($groups as $group) {
 		$acl = $group->group_acl;
 
-		$query = "UPDATE {$CONFIG->dbprefix}access_collections SET owner_guid = $group->guid WHERE id = $acl";
-		update_data($query);
+		try {
+			$query = "UPDATE {$CONFIG->dbprefix}access_collections SET owner_guid = $group->guid WHERE id = $acl";
+			update_data($query);
+		} catch (Exception $e) {
+			// no acl so create one
+			$ac_name = elgg_echo('groups:group') . ": " . $group->name;
+			$group_acl = create_access_collection($ac_name, $group->guid);
+			if ($group_acl) {
+				create_metadata($group->guid, 'group_acl', $group_acl, 'integer', $group->owner_guid);
+				$object->group_acl = $group_id;
+			}
+		}
+
 	}
 }
 elgg_set_ignore_access(FALSE);