2 files changed, 35 insertions, 17 deletions
diff --git a/views/rss/river/item.php b/views/rss/river/item.php
new file mode 100644
index 000000000..fa2914eff
--- /dev/null
+++ b/views/rss/river/item.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * RSS river view
+ *
+ * @uses $vars['item']
+ */
+$item = $vars['item'];
+
+$name = $item->getSubjectEntity()->name;
+$name = htmlspecialchars($name, ENT_NOQUOTES, 'UTF-8');
+$title = elgg_echo('river:update', array($name));
+
+$timestamp = date('r', $item->getPostedTime());
+$body = elgg_view('river/elements/summary', $vars, false, false, 'default');
+
+
+$object = $item->getObjectEntity();
+if ($object) {
+	$url = htmlspecialchars($object->getURL());
+} else {
+	$url = elgg_normalize_url('activity');
+}
+
+$html = <<<__HTML
+<item>
+	<guid>$item->id</guid>
+	<pubDate>$timestamp</pubDate>
+	<link>$url</link>
+	<title><![CDATA[$title]]></title>
+	<description><![CDATA[$body]]></description>
+</item>
+
+__HTML;
+
+echo $html;
diff --git a/views/rss/river/item/list.php b/views/rss/river/item/list.php
deleted file mode 100644
index 3b2fc6179..000000000
--- a/views/rss/river/item/list.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * @package Elgg
- * @subpackage Core
- */
-
-if (isset($vars['items']) && is_array($vars['items']) && !empty($vars['items'])) {
-	$i = 1;
-	foreach($vars['items'] as $item) {
-		if ($i++ >= $vars['limit']) {
-			break;
-		}
-		
-		$entity = get_entity($item->object_guid);
-		echo elgg_view_entity($entity);
-	}
-}