aboutsummaryrefslogtreecommitdiff
path: root/lib/album.php
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-06-05 12:14:47 +0000
committerCash Costello <cash.costello@gmail.com>2011-06-05 12:14:47 +0000
commitea8ea3c610582c8d564c5be38bc91b1987410a6b (patch)
treec09b9970fd7320f74fd4d1815692369dded39bab /lib/album.php
parenta1c32cf049031a463b1d7bb49a5c2957924d83a5 (diff)
downloadelgg-ea8ea3c610582c8d564c5be38bc91b1987410a6b.tar.gz
elgg-ea8ea3c610582c8d564c5be38bc91b1987410a6b.tar.bz2
merged in r580 and r581 into trunk
Diffstat (limited to 'lib/album.php')
-rw-r--r--lib/album.php7
1 files changed, 6 insertions, 1 deletions
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) {