Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

11 files changed, 39 insertions, 81 deletions

diff --git a/views/json/api/output.php b/views/json/api/output.php
index aab68f0dc..adeb7cc75 100644
--- a/views/json/api/output.php
+++ b/views/json/api/output.php
@@ -1,11 +1,10 @@
 <?php
 /**
  * Elgg JSON output
- * This outputs the api as JSON
+ * This outputs the api results as JSON
  *
  * @package Elgg
  * @subpackage Core
- *
  */
 
 $result = $vars['result'];
diff --git a/views/json/entities/entity_list.php b/views/json/entities/entity_list.php
deleted file mode 100644
index d5b134a71..000000000
--- a/views/json/entities/entity_list.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-$entities = $vars['entities'];
-$full_view = $vars['full_view'];
-
-if (is_array($entities) && sizeof($entities) > 0) {
-	foreach ($entities as $entity) {
-		echo elgg_view_entity($entity, array('full_view' => $full_view));
-	}
-}
diff --git a/views/json/group/default.php b/views/json/group/default.php
index a01b215cc..0b168fdb2 100644
--- a/views/json/group/default.php
+++ b/views/json/group/default.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Elgg default layout
+ * JSON group view
  *
  * @package Elgg
  * @subpackage Core
diff --git a/views/json/object/default.php b/views/json/object/default.php
index a01b215cc..d2e807621 100644
--- a/views/json/object/default.php
+++ b/views/json/object/default.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Elgg default layout
+ * JSON object view
  *
  * @package Elgg
  * @subpackage Core
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
diff --git a/views/json/river/item.php b/views/json/river/item.php
new file mode 100644
index 000000000..64677817f
--- /dev/null
+++ b/views/json/river/item.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * JSON river item view
+ *
+ * @uses $vars['item']
+ */
+
+global $jsonexport;
+
+if (!isset($jsonexport['activity'])) {
+	$jsonexport['activity'] = array();
+}
+
+$item = $vars['item'];
+if (elgg_view_exists($item->view, 'default')) {
+	$item->string = elgg_view('river/elements/summary', array('item' => $item), FALSE, FALSE, 'default');
+}
+
+$jsonexport['activity'][] = $vars['item'];
diff --git a/views/json/river/item/list.php b/views/json/river/item/list.php
deleted file mode 100644
index c79cd1042..000000000
--- a/views/json/river/item/list.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * JSON river view
- *
- * @package Elgg
- * @subpackage Core
- */
-global $jsonexport;
-
-$json_items = array();
-
-if (isset($vars['items']) && is_array($vars['items'])) {
-	$i = 0;
-	
-	if (!empty($vars['items'])) {
-		foreach($vars['items'] as $item) {
-			
-			$json_entry = array(
-				'subject' 		=>	NULL,
-				'object' 		=>	NULL,
-				'type' 			=>	NULL,
-				'subtype' 		=>	NULL,
-				'action_type' 	=>	NULL,
-				'view' 			=>	NULL,
-				'annotation'	=>	NULL,
-				'timestamp' 	=>	NULL,
-				'string' 		=>	NULL
-			);
-
-			if (elgg_view_exists($item->view, 'default')) {
-				$json_entry['string'] = elgg_view($item->view, array('item' => $item), FALSE, FALSE, 'default');
-				$json_entry['timestamp'] = (int)$item->posted;
-			}
-
-			$json_items[] = $json_entry;
-			
-			$i++;
-			if ($i >= $vars['limit']) {
-				break;
-			}
-		}
-	}
-}
-
-$jsonexport['activity'] = $json_items;
diff --git a/views/json/search/entity_list.php b/views/json/search/entity_list.php
deleted file mode 100644
index c778bf5df..000000000
--- a/views/json/search/entity_list.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Elgg default layout
- *
- * @package Elgg
- * @subpackage Core
- */
-
-$entities = $vars['entities'];
-if (is_array($entities) && sizeof($entities) > 0) {
-	foreach($entities as $entity) {
-		echo elgg_view_entity($entity);
-	}
-}
diff --git a/views/json/site/default.php b/views/json/site/default.php
index a01b215cc..7efd46939 100644
--- a/views/json/site/default.php
+++ b/views/json/site/default.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Elgg default layout
+ * JSON site view
  *
  * @package Elgg
  * @subpackage Core
diff --git a/views/json/user/default.php b/views/json/user/default.php
index a01b215cc..e23472252 100644
--- a/views/json/user/default.php
+++ b/views/json/user/default.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Elgg default layout
+ * JSON user view
  *
  * @package Elgg
  * @subpackage Core