diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-12 17:03:51 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-12 17:03:51 +0000 |
| commit | 73ed4ae8513af1cc6e795b125cc1f319a965bfb4 (patch) | |
| tree | 86681c6baee8869faab58940588251be692dd9e4 /mod/file | |
| parent | c41553d5e532ca86070d511d50d150d97869bb84 (diff) | |
| download | elgg-73ed4ae8513af1cc6e795b125cc1f319a965bfb4.tar.gz elgg-73ed4ae8513af1cc6e795b125cc1f319a965bfb4.tar.bz2 | |
Merged Cash's bugfixes from the 1.7 branch (3288:5377).
git-svn-id: http://code.elgg.org/elgg/trunk@5378 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/file')
| -rw-r--r-- | mod/file/friends.php | 1 | ||||
| -rw-r--r-- | mod/file/index.php | 3 | ||||
| -rw-r--r-- | mod/file/search.php | 5 | ||||
| -rw-r--r-- | mod/file/world.php | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/mod/file/friends.php b/mod/file/friends.php index 0693991d9..71dd2b10a 100644 --- a/mod/file/friends.php +++ b/mod/file/friends.php @@ -21,6 +21,7 @@ $area2 = elgg_view_title($title); set_context('search'); + // offset is grabbed in list_user_friends_objects $content = list_user_friends_objects($owner->guid, 'file', 10, false); set_context('file'); $area1 = get_filetype_cloud($owner->guid, true); diff --git a/mod/file/index.php b/mod/file/index.php index e76583f0f..af3d4c471 100644 --- a/mod/file/index.php +++ b/mod/file/index.php @@ -28,7 +28,8 @@ // Get objects set_context('search'); - $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'container_guid' => page_owner(), 'limit' => 10, 'full_view' => FALSE)); + $offset = (int)get_input('offset', 0); + $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'container_guid' => page_owner(), 'limit' => 10, 'offset' => $offset, 'full_view' => FALSE)); set_context('file'); $get_filter = get_filetype_cloud(page_owner()); if ($get_filter) { diff --git a/mod/file/search.php b/mod/file/search.php index ed8846514..ea85e862d 100644 --- a/mod/file/search.php +++ b/mod/file/search.php @@ -70,13 +70,14 @@ // Set context set_context('search'); - + + $offset = (int)get_input('offset', 0); $limit = 10; if ($search_viewtype == "gallery") $limit = 12; if (!empty($tag)) { $area2 .= list_entities_from_metadata($md_type, $tag, 'object', 'file', $owner_guid, $limit); } else { - $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'owner_guid' => $owner_guid, 'limit' => $limit)); + $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'owner_guid' => $owner_guid, 'limit' => $limit, 'offset' => $offset)); } set_context("file"); diff --git a/mod/file/world.php b/mod/file/world.php index 8b5e2cb0c..9f2ae5ee4 100644 --- a/mod/file/world.php +++ b/mod/file/world.php @@ -30,7 +30,7 @@ if ($tag != "") $area2 .= list_entities_from_metadata('tags',$tag,'object','file',0,10,false); else - $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'limit' => 10, 'full_view' => FALSE)); + $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'limit' => 10, 'offset' => $offset, 'full_view' => FALSE)); set_context('file'); $body = elgg_view_layout('two_column_left_sidebar',$area1, $area2); |