diff options
| author | Sem <sembrestels@riseup.net> | 2011-11-18 07:32:27 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2011-11-18 07:32:27 +0100 |
| commit | e53d410129701ea1c9d19529afa493f11b5f5b70 (patch) | |
| tree | d9963b24bf8932654b4a47e36602c75975e50dba /views/json/page | |
| parent | 377da25d2965c64941f83baae119fc970ec60982 (diff) | |
| parent | 08a962c98e2923724f8013d6eaae89101243752a (diff) | |
| download | elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.gz elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.bz2 | |
Merge github.com:Elgg/Elgg
Conflicts:
engine/lib/input.php
Diffstat (limited to 'views/json/page')
| -rw-r--r-- | views/json/page/components/list.php | 14 | ||||
| -rw-r--r-- | views/json/page/default.php | 7 |
2 files changed, 15 insertions, 6 deletions
diff --git a/views/json/page/components/list.php b/views/json/page/components/list.php new file mode 100644 index 000000000..5de4f1f59 --- /dev/null +++ b/views/json/page/components/list.php @@ -0,0 +1,14 @@ +<?php +/** + * JSON list view + * + * @uses $vars['items'] + */ + +$items = $vars['items']; + +if (is_array($items) && sizeof($items) > 0) { + foreach ($items as $item) { + elgg_view_list_item($item, $vars); + } +}
\ No newline at end of file diff --git a/views/json/page/default.php b/views/json/page/default.php index d1f86c8a7..2d0403e11 100644 --- a/views/json/page/default.php +++ b/views/json/page/default.php @@ -7,12 +7,7 @@ * */ -if(stristr($_SERVER["HTTP_ACCEPT"],"application/json")) { - header("Content-Type: application/json"); -} else { - header("Content-Type: application/javascript"); -} -// echo $vars['body']; +header("Content-Type: application/json"); global $jsonexport; echo json_encode($jsonexport);
\ No newline at end of file |