diff options
author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-04-19 18:26:38 +0000 |
---|---|---|
committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-04-19 18:26:38 +0000 |
commit | f9271180b1e82fdf746d315b241efb3ebabd8f35 (patch) | |
tree | fc5dd554d4c47c126c5231a36fd4cff72964017d /mod/search/index.php | |
parent | 2c27964706285c91845dbc3f116e58dac32c3913 (diff) | |
download | elgg-f9271180b1e82fdf746d315b241efb3ebabd8f35.tar.gz elgg-f9271180b1e82fdf746d315b241efb3ebabd8f35.tar.bz2 |
Merged previous to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@5803 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/search/index.php')
-rw-r--r-- | mod/search/index.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mod/search/index.php b/mod/search/index.php index 8ee44d9e7..2a6b2ce62 100644 --- a/mod/search/index.php +++ b/mod/search/index.php @@ -8,7 +8,7 @@ * @link http://elgg.org/ */ -// Search supports RSS +// Search supports RSS global $autofeed; $autofeed = true; @@ -27,6 +27,7 @@ $offset = ($search_type == 'all') ? 0 : get_input('offset', 0); $entity_type = get_input('entity_type', ELGG_ENTITIES_ANY_VALUE); $entity_subtype = get_input('entity_subtype', ELGG_ENTITIES_ANY_VALUE); $owner_guid = get_input('owner_guid', ELGG_ENTITIES_ANY_VALUE); +$container_guid = get_input('container_guid', ELGG_ENTITIES_ANY_VALUE); $friends = get_input('friends', ELGG_ENTITIES_ANY_VALUE); $sort = get_input('sort'); switch ($sort) { @@ -59,6 +60,7 @@ $params = array( 'subtype' => $entity_subtype, // 'tag_type' => $tag_type, 'owner_guid' => $owner_guid, + 'container_guid' => $container_guid, // 'friends' => $friends 'pagination' => ($search_type == 'all') ? FALSE : TRUE ); |