From ea8ea3c610582c8d564c5be38bc91b1987410a6b Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 5 Jun 2011 12:14:47 +0000
Subject: merged in r580 and r581 into trunk

---
 actions/edit.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'actions')

diff --git a/actions/edit.php b/actions/edit.php
index cca66941a..df65448c8 100644
--- a/actions/edit.php
+++ b/actions/edit.php
@@ -36,7 +36,12 @@ if ($subtype == 'album' && $entity->access_id != $access) {
 	$entity->access_id = $access;
 
 	//get images from album and update access on image entities
-	$images = get_entities("object","image", $guid, '', 999, '', false);
+	$images = elgg_get_entities(array(
+		"type" => "object",
+		"subtype" => "image",
+		"container_guid" => $guid,
+		"limit" => ELGG_ENTITIES_NO_VALUE,
+	));
 	foreach ($images as $im) {
 		$im->access_id = $access;
 		$im->save();
-- 
cgit v1.2.3