diff options
| author | Cash Costello <cash.costello@gmail.com> | 2011-10-06 17:04:56 -0700 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2011-10-06 17:04:56 -0700 |
| commit | 2f653d54c54ce31d9444ba704e9fd281977f663b (patch) | |
| tree | e11951881791298fc23ebfc68f37ed99030f919d /engine | |
| parent | 26b56fb5d6d71bb56f03d0d4e999e09a1fc81476 (diff) | |
| parent | b4f38ff041fcfe5c1a685f55fd8a801648b0f6b5 (diff) | |
| download | elgg-2f653d54c54ce31d9444ba704e9fd281977f663b.tar.gz elgg-2f653d54c54ce31d9444ba704e9fd281977f663b.tar.bz2 | |
Merge pull request #64 from blacktooth/livesearch_patch
Livesearch handler returns proper JSON string now
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/input.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/lib/input.php b/engine/lib/input.php index 56ec214dc..8ba3ac180 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) { - $json = json_encode(array( + $result = 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)] = $json; + ); + $results[$entity->name . rand(1, 100)] = $result; } } break; @@ -321,16 +321,16 @@ function input_livesearch_page_handler($page) { "; if ($entities = get_data($query)) { foreach ($entities as $entity) { - $json = json_encode(array( + $result = 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)] = $json; + $results[$entity->name . rand(1, 100)] = $result; } } break; @@ -353,15 +353,15 @@ function input_livesearch_page_handler($page) { if ($entities = get_data($query)) { foreach ($entities as $entity) { - $json = json_encode(array( + $result = 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)] = $json; + ); + $results[$entity->name . rand(1, 100)] = $result; } } break; @@ -376,7 +376,7 @@ function input_livesearch_page_handler($page) { } ksort($results); - echo implode($results, "\n"); + echo json_encode(array_values($results)); exit; } |