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

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

(limited to 'lib/album.php')

diff --git a/lib/album.php b/lib/album.php
index 0d5140875..e178acd5d 100644
--- a/lib/album.php
+++ b/lib/album.php
@@ -209,7 +209,12 @@ class TidypicsAlbum extends ElggObject {
 
 	protected function deleteImages() {
 		// get all the images from this album as long as less than 999 images
-		$images = get_entities("object", "image", $this->guid, '', 999);
+		$images = elgg_get_entities(array(
+			"type=" => "object",
+			"subtype" => "image",
+			"container_guid" => $this->guid,
+			"limit" => ELGG_ENTITIES_NO_VALUE,
+		));
 		if ($images) {
 			foreach ($images as $image) {
 				if ($image) {
-- 
cgit v1.2.3