aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-26 16:24:02 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-26 16:24:02 +0000
commit7944c2a3c3fda7cb6bf4af6c68435f5c223f4b51 (patch)
treee753373d4a671de973e5a9ae036e7dd443e3f151
parentf232deeb4d3308f6a6482845c80edec0d76f867f (diff)
downloadelgg-7944c2a3c3fda7cb6bf4af6c68435f5c223f4b51.tar.gz
elgg-7944c2a3c3fda7cb6bf4af6c68435f5c223f4b51.tar.bz2
Fixes #2922: pg/livesearch now works with "term" parameter
git-svn-id: http://code.elgg.org/elgg/trunk@9025 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/input.php2
-rw-r--r--views/default/input/autocomplete.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/lib/input.php b/engine/lib/input.php
index 25416b868..84752bc7d 100644
--- a/engine/lib/input.php
+++ b/engine/lib/input.php
@@ -237,7 +237,7 @@ function input_livesearch_page_handler($page) {
exit;
}
- if (!$q = get_input('q')) {
+ if (!$q = get_input('term', get_input('q'))) {
exit;
}
diff --git a/views/default/input/autocomplete.php b/views/default/input/autocomplete.php
index b16d08fc3..0a4057ddf 100644
--- a/views/default/input/autocomplete.php
+++ b/views/default/input/autocomplete.php
@@ -35,7 +35,7 @@ elgg_load_js('elgg.autocomplete');
<script type="text/javascript">
elgg.provide('elgg.autocomplete');
-elgg.autocomplete.url = "<?php elgg_get_site_url() . 'livesearch?' . $ac_url_params; ?>";
+elgg.autocomplete.url = "<?php echo elgg_get_site_url() . 'livesearch?' . $ac_url_params; ?>";
</script>
<input type="text" <?php echo elgg_format_attributes($vars); ?> />