2 files changed, 19 insertions, 49 deletions
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 8ab836f0a..000000000
--- a/views/json/river/item/list.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-	global $jsonexport;
-	if (isset($vars['items']) && is_array($vars['items'])) {
-		
-		$i = 0;
-		if (!empty($vars['items']))
-		foreach($vars['items'] as $item) {
-			
-			// echo elgg_view_river_item($item);
-			if (elgg_view_exists($item->view,'default')) {
-				$body = elgg_view($item->view,array(
-									'item' => $item
-								 ),false,false,'default');
-				$time = date("r",$item->posted);
-				if ($entity = get_entity($item->object_guid)) {
-					$url = htmlspecialchars($entity->getURL());
-				} else {
-					$url = $vars['url'];
-				}
-				$title = strip_tags($body);
-
-				$jsonitem = $item;
-				$jsonitem->url = $url;
-				$jsonitem->description = autop($body);
-				$jsonitem->title = $title;
-				unset($jsonitem->view);
-				
-				if ($subject = get_entity($item->subject_guid)) {
-					elgg_view_entity($subject);
-				}
-				if ($object = get_entity($item->object_guid)) {
-					elgg_view_entity($object);
-				}
-				
-				$jsonexport['activity'][] = $jsonitem;
-				
-			}
-			
-			$i++;
-			if ($i >= $vars['limit']) break;
-			
-		}
-		
-	}
-	echo "!";
-	
-
-?>
-\ No newline at end of file