aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2011-11-18 07:24:23 +0100
committerSem <sembrestels@riseup.net>2011-11-18 07:24:23 +0100
commit377da25d2965c64941f83baae119fc970ec60982 (patch)
tree3d9cfba4bbadd932c9ec130af9cf41b96aef9ae3 /engine
parent16bea056538ba68a4c5d36c97c1bdab1bac743aa (diff)
downloadelgg-377da25d2965c64941f83baae119fc970ec60982.tar.gz
elgg-377da25d2965c64941f83baae119fc970ec60982.tar.bz2
Revert "Merge branch 'livesearch_patch' of https://github.com/blacktooth/Elgg"
This reverts commit 3939a817def8d0a3d047456c4ad3817d5ee0a1d5, reversing changes made to 50aa0ce357fd307ac2623e96f22d7c0f973b22ff.
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/input.php20
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/lib/input.php b/engine/lib/input.php
index 8ba3ac180..56ec214dc 100644
--- a/engine/lib/input.php
+++ b/engine/lib/input.php
@@ -294,15 +294,15 @@ function input_livesearch_page_handler($page) {
if ($entities = get_data($query)) {
foreach ($entities as $entity) {
- $result = array(
+ $json = json_encode(array(
'type' => 'user',
'name' => $entity->name,
'desc' => $entity->username,
'icon' => '<img class="livesearch_icon" src="' .
get_entity($entity->guid)->getIconURL('tiny') . '" />',
'guid' => $entity->guid
- );
- $results[$entity->name . rand(1, 100)] = $result;
+ ));
+ $results[$entity->name . rand(1, 100)] = $json;
}
}
break;
@@ -321,16 +321,16 @@ function input_livesearch_page_handler($page) {
";
if ($entities = get_data($query)) {
foreach ($entities as $entity) {
- $result = array(
+ $json = json_encode(array(
'type' => 'group',
'name' => $entity->name,
'desc' => strip_tags($entity->description),
'icon' => '<img class="livesearch_icon" src="'
. get_entity($entity->guid)->getIcon('tiny') . '" />',
'guid' => $entity->guid
- );
+ ));
- $results[$entity->name . rand(1, 100)] = $result;
+ $results[$entity->name . rand(1, 100)] = $json;
}
}
break;
@@ -353,15 +353,15 @@ function input_livesearch_page_handler($page) {
if ($entities = get_data($query)) {
foreach ($entities as $entity) {
- $result = array(
+ $json = json_encode(array(
'type' => 'user',
'name' => $entity->name,
'desc' => $entity->username,
'icon' => '<img class="livesearch_icon" src="'
. get_entity($entity->guid)->getIcon('tiny') . '" />',
'guid' => $entity->guid
- );
- $results[$entity->name . rand(1, 100)] = $result;
+ ));
+ $results[$entity->name . rand(1, 100)] = $json;
}
}
break;
@@ -376,7 +376,7 @@ function input_livesearch_page_handler($page) {
}
ksort($results);
- echo json_encode(array_values($results));
+ echo implode($results, "\n");
exit;
}