aboutsummaryrefslogtreecommitdiff
path: root/mod/search
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-01-20 22:40:04 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-01-20 22:40:04 +0000
commit6c982791baab8fe682326b6916516fbfab32d46b (patch)
tree77b76bdf7f31a3d341b63256aa38f28a44deabaa /mod/search
parentbd20e644915cac09d163d3369c6cdbc36d3760f4 (diff)
downloadelgg-6c982791baab8fe682326b6916516fbfab32d46b.tar.gz
elgg-6c982791baab8fe682326b6916516fbfab32d46b.tar.bz2
Fixing bugs in search that would break pagination.
git-svn-id: http://code.elgg.org/elgg/trunk@3818 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/search')
-rw-r--r--mod/search/views/default/search/listing.php14
1 files changed, 2 insertions, 12 deletions
diff --git a/mod/search/views/default/search/listing.php b/mod/search/views/default/search/listing.php
index 36032940d..5142e1fe5 100644
--- a/mod/search/views/default/search/listing.php
+++ b/mod/search/views/default/search/listing.php
@@ -22,7 +22,8 @@ $query = htmlspecialchars(http_build_query(
'entity_subtype' => $vars['params']['subtype'],
'limit' => get_input('limit', 10),
'offset' => get_input('offset', 0),
- 'search_type' => 'comments',
+ 'search_type' => $vars['params']['search_type'],
+ //@todo include vars for sorting, order, and friend-only.
)
));
@@ -67,17 +68,6 @@ if (array_key_exists('search_type', $vars['params'])
$type_str = $search_type_str;
}
-$query = htmlspecialchars(http_build_query(
- array(
- 'q' => $vars['params']['query'],
- 'entity_type' => $vars['params']['type'],
- 'entity_subtype' => $vars['params']['subtype'],
- 'search_type' => 'entities',
- )
-));
-
-$url = "{$vars['url']}pg/search?$query";
-
// get pagination
if (array_key_exists('pagination', $vars['params']) && $vars['params']['pagination']) {
$nav .= elgg_view('navigation/pagination',array(