aboutsummaryrefslogtreecommitdiff
path: root/mod/file
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-22 21:11:36 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-22 21:11:36 +0000
commitd45a24be28b2eb2d0c2731708b589788a5b87215 (patch)
treed73568e65b05c42cc23b8c355a80907684be2cb5 /mod/file
parent46c278c3603765b623fa441e2435274fbeda05ad (diff)
downloadelgg-d45a24be28b2eb2d0c2731708b589788a5b87215.tar.gz
elgg-d45a24be28b2eb2d0c2731708b589788a5b87215.tar.bz2
Merged r6671:6683 from 1.7 branch to trunk
git-svn-id: http://code.elgg.org/elgg/trunk@6847 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/file')
-rw-r--r--mod/file/world.php8
1 files changed, 1 insertions, 7 deletions
diff --git a/mod/file/world.php b/mod/file/world.php
index 38ab4e8ff..735692d79 100644
--- a/mod/file/world.php
+++ b/mod/file/world.php
@@ -12,7 +12,6 @@
$limit = get_input("limit", 10);
$offset = get_input("offset", 0);
- $tag = get_input("tag");
// Get the current page's owner
$page_owner = page_owner_entity();
@@ -27,10 +26,7 @@
$area1 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'file'));
$area1 .= get_filetype_cloud(); // the filter
set_context('search');
- 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, 'offset' => $offset, 'full_view' => FALSE));
+ $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE));
set_context('file');
//get the latest comments on all files
@@ -41,6 +37,4 @@
$body = elgg_view_layout('one_column_with_sidebar', $content, $area3);
- // Finally draw the page
page_draw($title, $body);
-?> \ No newline at end of file