diff options
| author | Cash Costello <cash.costello@gmail.com> | 2009-12-13 02:03:17 +0000 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2009-12-13 02:03:17 +0000 |
| commit | dd8ff039f642b9eb6ea65cc1a58017ce867ec7b3 (patch) | |
| tree | 71f92cbf22405ddbec079480e207c7fd3fe00e0a /pages | |
| parent | e7a7c88d81f494d8a0c99f36338247caaf6b4bd3 (diff) | |
| download | elgg-dd8ff039f642b9eb6ea65cc1a58017ce867ec7b3.tar.gz elgg-dd8ff039f642b9eb6ea65cc1a58017ce867ec7b3.tar.bz2 | |
fixed display of some album pages - caused a cascade of changes required
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/friends.php | 5 | ||||
| -rw-r--r-- | pages/lists/mostrecentimages.php | 2 | ||||
| -rw-r--r-- | pages/ownedalbums.php | 6 | ||||
| -rw-r--r-- | pages/world.php | 8 |
4 files changed, 12 insertions, 9 deletions
diff --git a/pages/friends.php b/pages/friends.php index e35adce04..03ae1300a 100644 --- a/pages/friends.php +++ b/pages/friends.php @@ -26,11 +26,14 @@ $area2 = elgg_view_title($title); + $albums = get_user_friends_objects($user->guid, 'album', 12); + // get html for viewing list of photo albums set_context('search'); set_input('search_viewtype', 'gallery'); // need to force gallery view - $area2 .= list_user_friends_objects($user->guid, 'album', 10, true, false); + $content = tp_view_entity_list($albums, count($albums), 0, 12, false, false, true); + $area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,)); $body = elgg_view_layout('two_column_left_sidebar', '', $area2); diff --git a/pages/lists/mostrecentimages.php b/pages/lists/mostrecentimages.php index 99dfeb4c9..178e3c722 100644 --- a/pages/lists/mostrecentimages.php +++ b/pages/lists/mostrecentimages.php @@ -43,7 +43,7 @@ $max = 12; // grab the html to display the images - $images = tp_list_entities("object", "image", $user_id, $max, false, false, true); + $images = tp_list_entities("object", "image", $user_id, null, $max, false, false, true); // 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 f43c2c5eb..d22c6d44a 100644 --- a/pages/ownedalbums.php +++ b/pages/ownedalbums.php @@ -39,9 +39,11 @@ set_context('search'); set_input('search_viewtype', 'gallery'); if ($owner instanceof ElggGroup) - $area2 .= list_entities("object", "album", $owner->guid, 12, false); + $content .= tp_list_entities("object", "album", 0, $owner->guid, 12, false); else - $area2 .= list_entities("object", "album", $owner->guid, 12, false); + $content .= tp_list_entities("object", "album", $owner->guid, $owner->guid, 12, false); + + $area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,)); set_context('photos'); $body = elgg_view_layout('two_column_left_sidebar', '', $area2); diff --git a/pages/world.php b/pages/world.php index 9488f2620..48a3345d4 100644 --- a/pages/world.php +++ b/pages/world.php @@ -14,16 +14,14 @@ $num_albums = 16; $title = elgg_echo('album:all'); - - set_context('photos'); $area2 = elgg_view_title($title); set_context('search'); set_input('search_viewtype', 'gallery'); - $albums_html .= list_entities('object','album', 0, $num_albums, false); + $content .= tp_list_entities('object','album', 0, null, $num_albums, false); + set_context('photos'); - - $area2 .= $albums_html; + $area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,)); $body = elgg_view_layout('two_column_left_sidebar', '', $area2); |