From 1e5a6f5ba512107dc2c7f842d756015d04bc0999 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 20 Mar 2011 21:08:58 +0000
Subject: Fixes #3197 fixed the RSS feed for activity (river)

git-svn-id: http://code.elgg.org/elgg/trunk@8786 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/river.php          |  2 ++
 pages/river.php               |  6 +++---
 views/rss/core/river/body.php | 32 --------------------------------
 views/rss/river/item.php      | 32 ++++++++++++++++++++++++++++++++
 views/rss/river/item/list.php | 17 -----------------
 5 files changed, 37 insertions(+), 52 deletions(-)
 delete mode 100644 views/rss/core/river/body.php
 create mode 100644 views/rss/river/item.php
 delete mode 100644 views/rss/river/item/list.php

diff --git a/engine/lib/river.php b/engine/lib/river.php
index 50663c966..80925a21d 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -325,6 +325,8 @@ function elgg_get_river(array $options = array()) {
  * @since 1.8.0
  */
 function elgg_list_river(array $options = array()) {
+	global $autofeed;
+	$autofeed = true;
 
 	$defaults = array(
 		'offset'     => (int) max(get_input('offset', 0), 0),
diff --git a/pages/river.php b/pages/river.php
index 728df50e1..7f2fce3d6 100644
--- a/pages/river.php
+++ b/pages/river.php
@@ -40,14 +40,14 @@ switch ($page_type) {
 		break;
 }
 
-$content = elgg_view('core/river/filter', array('selector' => $selector));
+$activity = elgg_list_river($options);
 
-$content .= elgg_list_river($options);
+$content = elgg_view('core/river/filter', array('selector' => $selector));
 
 $sidebar = elgg_view('core/river/sidebar');
 
 $params = array(
-	'content' =>  $content,
+	'content' =>  $content . $activity,
 	'sidebar' => $sidebar,
 	'buttons' => '',
 	'filter_context' => $page_filter,
diff --git a/views/rss/core/river/body.php b/views/rss/core/river/body.php
deleted file mode 100644
index f84e6ccf0..000000000
--- a/views/rss/core/river/body.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * RSS river view
- *
- * @uses $vars['item']
- */
-$item = $vars['item'];
-
-$view = $item->getView();
-
-$name = $item->getSubjectEntity()->name;
-$body = elgg_view($item->getView(), array('item' => $item), false, false, 'default');
-$body = "$name $body";
-
-$title = strip_tags($body);
-$timestamp = date('r', $item->getPostedTime());
-
-$object = $item->getObjectEntity();
-if ($object) {
-	$url = htmlspecialchars($object->getURL());
-} else {
-	$url = elgg_get_site_url() . 'activity';
-}
-
-?>
-<item>
-	<guid isPermaLink='true'><?php echo $url; ?></guid>
-	<pubDate><?php echo $timestamp; ?></pubDate>
-	<link><?php echo $url; ?></link>
-	<title><![CDATA[<?php echo $title; ?>]]></title>
-	<description><![CDATA[<?php echo ($body); ?>]]></description>
-</item>
diff --git a/views/rss/river/item.php b/views/rss/river/item.php
new file mode 100644
index 000000000..f84e6ccf0
--- /dev/null
+++ b/views/rss/river/item.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * RSS river view
+ *
+ * @uses $vars['item']
+ */
+$item = $vars['item'];
+
+$view = $item->getView();
+
+$name = $item->getSubjectEntity()->name;
+$body = elgg_view($item->getView(), array('item' => $item), false, false, 'default');
+$body = "$name $body";
+
+$title = strip_tags($body);
+$timestamp = date('r', $item->getPostedTime());
+
+$object = $item->getObjectEntity();
+if ($object) {
+	$url = htmlspecialchars($object->getURL());
+} else {
+	$url = elgg_get_site_url() . 'activity';
+}
+
+?>
+<item>
+	<guid isPermaLink='true'><?php echo $url; ?></guid>
+	<pubDate><?php echo $timestamp; ?></pubDate>
+	<link><?php echo $url; ?></link>
+	<title><![CDATA[<?php echo $title; ?>]]></title>
+	<description><![CDATA[<?php echo ($body); ?>]]></description>
+</item>
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);
-	}
-}
-- 
cgit v1.2.3