merged in r580 and r581 into trunk

4 files changed, 18 insertions, 4 deletions

diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index 47d20f3ae..4d797d842 100644
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -28,7 +28,12 @@ if ($album_river_view == "cover") {
 
 	$string .= "<div class=\"river_content\">";
 
-	$images = get_entities("object", "image", $album->guid, 'time_created desc', 7);
+	$images = elgg_get_entities(array(
+		"type" => "object",
+		"subtype" => "image",
+		"container_guid" => $album->guid,
+		"limit" => 7,
+	));
 
 	if (count($images)) {
 		foreach($images as $image) {
diff --git a/views/default/tidypics/albums.php b/views/default/tidypics/albums.php
index 7e0cd2d6c..61daadba7 100644
--- a/views/default/tidypics/albums.php
+++ b/views/default/tidypics/albums.php
@@ -7,7 +7,12 @@ if (!$number) {
 }
 
 $owner = page_owner_entity();
-$owner_albums = get_entities("object", "album", page_owner(), "", $number, 0, false);
+$owner_albums = elgg_get_entities(array(
+	"type" => "object",
+	"subtype" => "album",
+	"container_guid" => page_owner(),
+	"limit" => $number,
+));
 
 echo '<div id="tidypics_album_widget_container">';
 
diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php
index c81c9173d..4a7a05c0c 100644
--- a/views/default/tidypics/forms/ajax_upload.php
+++ b/views/default/tidypics/forms/ajax_upload.php
@@ -1,6 +1,6 @@
 <?php
 
-extend_view('metatags', 'tidypics/js/uploader');
+elgg_extend_view('metatags', 'tidypics/js/uploader');
 
 $album = $vars['album'];
 
diff --git a/views/default/tidypics/forms/setupFlickr.php b/views/default/tidypics/forms/setupFlickr.php
index 54f0a37d1..6c461176d 100644
--- a/views/default/tidypics/forms/setupFlickr.php
+++ b/views/default/tidypics/forms/setupFlickr.php
@@ -11,7 +11,11 @@ $form_body = "<p>". elgg_echo( 'flickr:intro' ) . "</p><p>";
 $form_body .= elgg_echo( 'flickr:usernamesetup') . " <input style='width: 20%;' type='text' name='flickr_username' value='$flickr_username->value' ' class='input-text' /> <br />";
 $form_body .= "<input type='hidden' name='return_url' value='$_SERVER[REQUEST_URI]' />";
 
-$albums = get_entities( "object", "album", $user->guid );
+$albums = elgg_get_entities(array(
+	"type=" => "object",
+	"subtype" => "album",
+	"owner_guid" => $user->guid,
+));
 $options = array( 0 => elgg_echo( 'flickr:selectalbum' ));
 foreach( $albums as $album ) {
 	$title = $album->title;