From 377da25d2965c64941f83baae119fc970ec60982 Mon Sep 17 00:00:00 2001 From: Sem Date: Fri, 18 Nov 2011 07:24:23 +0100 Subject: Revert "Merge branch 'livesearch_patch' of https://github.com/blacktooth/Elgg" This reverts commit 3939a817def8d0a3d047456c4ad3817d5ee0a1d5, reversing changes made to 50aa0ce357fd307ac2623e96f22d7c0f973b22ff. --- engine/lib/input.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'engine/lib') 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' => '', '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' => '', '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' => '', '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; } -- cgit v1.2.3