diff options
| author | Cash Costello <cash.costello@gmail.com> | 2011-06-05 12:14:47 +0000 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2011-06-05 12:14:47 +0000 |
| commit | ea8ea3c610582c8d564c5be38bc91b1987410a6b (patch) | |
| tree | c09b9970fd7320f74fd4d1815692369dded39bab /pages | |
| parent | a1c32cf049031a463b1d7bb49a5c2957924d83a5 (diff) | |
| download | elgg-ea8ea3c610582c8d564c5be38bc91b1987410a6b.tar.gz elgg-ea8ea3c610582c8d564c5be38bc91b1987410a6b.tar.bz2 | |
merged in r580 and r581 into trunk
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/edit_multiple.php | 9 | ||||
| -rw-r--r-- | pages/lists/mostrecentimages.php | 8 | ||||
| -rw-r--r-- | pages/ownedalbums.php | 16 | ||||
| -rw-r--r-- | pages/world.php | 7 |
4 files changed, 35 insertions, 5 deletions
diff --git a/pages/edit_multiple.php b/pages/edit_multiple.php index 938ac203c..7c7b989cf 100644 --- a/pages/edit_multiple.php +++ b/pages/edit_multiple.php @@ -15,7 +15,14 @@ set_page_owner(get_loggedin_userid()); $batch = get_input('batch'); if ($batch) { - $images = get_entities_from_metadata('batch', $batch, 'object', 'image', get_loggedin_userid(), 100); + $images = elgg_get_entities_from_metadata(array( + 'metadata_name' => 'batch', + 'metadata_value' => $batch, + 'type' => 'object', + 'subtype' => 'image', + 'owner_guid' => get_loggedin_userid(), + 'limit' => ELGG_ENTITIES_NO_VALUE, + )); } else { // parse out photo guids $file_string = get_input('files'); diff --git a/pages/lists/mostrecentimages.php b/pages/lists/mostrecentimages.php index 722f1fc32..0a2595c85 100644 --- a/pages/lists/mostrecentimages.php +++ b/pages/lists/mostrecentimages.php @@ -44,7 +44,13 @@ if ($slideshow_link) { $max = 12; // grab the html to display the images -$images = tp_list_entities("object", "image", $user_id, null, $max, false, false, true); +$images = elgg_list_entities(array( + "type" => "object", + "subtype" => "image", + "owner_guid" => $user_id, + "limit" => $max, + "full_view" => false, +)); // this view takes care of the title on the main column and the content wrapper diff --git a/pages/ownedalbums.php b/pages/ownedalbums.php index 67583c65c..9483512c6 100644 --- a/pages/ownedalbums.php +++ b/pages/ownedalbums.php @@ -41,9 +41,21 @@ $area2 = elgg_view_title($title); set_context('search'); set_input('search_viewtype', 'gallery'); if ($owner instanceof ElggGroup) { - $content .= tp_list_entities("object", "album", 0, $owner->guid, 12, false); + $content .= elgg_list_entities(array( + "type" => "object", + "subtype" => "album", + "container_guid" => $owner->guid, + "limit" => 12, + "full_view" => false, +)); } else { - $content .= tp_list_entities("object", "album", $owner->guid, $owner->guid, 12, false); + $content .= elgg_list_entities(array( + "type" => "object", + "subtype" => "album", + "container_guid" => $owner->guid, + "limit" => 12, + "full_view" => false, +)); } $area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,)); diff --git a/pages/world.php b/pages/world.php index fe97a882d..25a69da52 100644 --- a/pages/world.php +++ b/pages/world.php @@ -18,7 +18,12 @@ $area2 = elgg_view_title($title); set_context('search'); set_input('search_viewtype', 'gallery'); -$content .= tp_list_entities('object','album', 0, null, $num_albums, false); +$content .= elgg_list_entities(array( + 'type' => 'object', + 'subtype' => 'album', + 'limit' => $num_albums, + 'pagination' => false, +)); set_context('photos'); $area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,)); |