Fixing bugs in search that would break pagination.

git-svn-id: http://code.elgg.org/elgg/trunk@3818 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/search/views/default/search/listing.php b/mod/search/views/default/search/listing.php
index 36032940dea9057b5397d49836c9433e377defe1..5142e1fe52a3c8037c1059397518794649b6f629 100644 (file)
--- 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(