2 files changed, 35 insertions, 44 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 5ac43c544..000000000
--- a/views/rss/river/item/list.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-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);
-
-	?>
-	<item>
-		<guid isPermaLink='true'><?php echo $url; ?></guid>
-		<pubDate><?php echo $time; ?></pubDate>
-		<link><?php echo $url; ?></link>
-		<title><![CDATA[<?php echo $title; ?>]]></title>
-		<description><![CDATA[<?php echo (autop($body)); ?>]]></description>
-	</item>
-	<?php
-
-			}
-
-			$i++;
-			if ($i >= $vars['limit']) {
-				break;
-			}
-		}
-	}
-}
-\ No newline at end of file