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 /views/default/tidypics/forms/setupFlickr.php | |
parent | a1c32cf049031a463b1d7bb49a5c2957924d83a5 (diff) | |
download | elgg-ea8ea3c610582c8d564c5be38bc91b1987410a6b.tar.gz elgg-ea8ea3c610582c8d564c5be38bc91b1987410a6b.tar.bz2 |
merged in r580 and r581 into trunk
Diffstat (limited to 'views/default/tidypics/forms/setupFlickr.php')
-rw-r--r-- | views/default/tidypics/forms/setupFlickr.php | 6 |
1 files changed, 5 insertions, 1 deletions
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; |