5 files changed, 38 insertions, 23 deletions
diff --git a/views/rss/group/default.php b/views/rss/group/default.php
index f57c7f82c..7fef4d434 100644
--- a/views/rss/group/default.php
+++ b/views/rss/group/default.php
@@ -11,9 +11,9 @@ $pubdate = date('r', $vars['entity']->getTimeCreated());
 $title = htmlspecialchars($vars['entity']->name, ENT_NOQUOTES, 'UTF-8');
 
 if ($vars['entity']->description) {
-	$description = autop($vars['entity']->description);
+	$description = elgg_autop($vars['entity']->description);
 } elseif ($vars['entity']->briefdescription) {
-	$description = autop($vars['entity']->briefdescription);
+	$description = elgg_autop($vars['entity']->briefdescription);
 } else {
 	$description = '';
 }
diff --git a/views/rss/object/default.php b/views/rss/object/default.php
index be8025953..8c7d5d8e0 100644
--- a/views/rss/object/default.php
+++ b/views/rss/object/default.php
@@ -15,7 +15,7 @@ if (empty($title)) {
 $permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8');
 $pubdate = date('r', $vars['entity']->getTimeCreated());
 
-$description = autop($vars['entity']->description);
+$description = elgg_autop($vars['entity']->description);
 
 $creator = elgg_view('page/components/creator', $vars);
 $georss = elgg_view('page/components/georss', $vars);
diff --git a/views/rss/page/components/gallery.php b/views/rss/page/components/gallery.php
new file mode 100644
index 000000000..690416e5b
--- /dev/null
+++ b/views/rss/page/components/gallery.php
@@ -0,0 +1,8 @@
+<?php
+/*
+ * RSS gallery view
+ *
+ * @uses $vars['items']
+ */
+
+echo elgg_view('page/components/list', $vars);
diff --git a/views/rss/page/default.php b/views/rss/page/default.php
index 246ec972e..a7b757760 100644
--- a/views/rss/page/default.php
+++ b/views/rss/page/default.php
@@ -2,17 +2,13 @@
 /**
  * Elgg RSS output pageshell
  *
- * @package Elgg
- * @subpackage Core
+ * @package Elgg.Core
+ *
+ * @uses $vars['title']      The title of the RSS feed
+ * @uses $vars['body']       The items for the RSS feed as a string
+ * @uses $vars['descrption'] The description for the RSS feed
  */
 
-header("Content-Type: text/xml");
-
-// allow caching as required by stupid MS products for https feeds.
-header('Pragma: public', TRUE);
-
-echo "<?xml version='1.0'?>";
-
 // Set title
 if (empty($vars['title'])) {
 	$title = elgg_get_config('sitename');
@@ -21,19 +17,30 @@ if (empty($vars['title'])) {
 }
 
 // Remove RSS from URL
-$url = str_replace('?view=rss', '', full_url());
+$url = str_replace('?view=rss', '', current_page_url());
 $url = str_replace('&view=rss', '', $url);
+$url = htmlspecialchars($url, ENT_NOQUOTES, 'UTF-8');
 
-?>
+$body = elgg_extract('body', $vars, '');
+$description = elgg_extract('description', $vars, '');
 
-<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:georss="http://www.georss.org/georss" <?php echo elgg_view('extensions/xmlns'); ?> >
+$namespaces = elgg_view('extensions/xmlns');
+$extensions = elgg_view('extensions/channel');
+
+
+// allow caching as required by stupid MS products for https feeds.
+header('Pragma: public', true);
+header("Content-Type: text/xml");
+
+echo "<?xml version='1.0'?>";
+echo <<<END
+<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:georss="http://www.georss.org/georss" $namespaces>
 <channel>
-	<title><![CDATA[<?php echo $title; ?>]]></title>
-	<link><?php echo htmlentities($url); ?></link>
-	<description></description>
-<?php
-	echo elgg_view('extensions/channel');
-	echo $vars['body'];
-?>
+	<title><![CDATA[$title]]></title>
+	<link>$url</link>
+	<description><![CDATA[$description]]></description>
+	$extensions
+	$body
 </channel>
 </rss>
+END;
diff --git a/views/rss/user/default.php b/views/rss/user/default.php
index 1c7bf75e7..92c9427b2 100644
--- a/views/rss/user/default.php
+++ b/views/rss/user/default.php
@@ -11,7 +11,7 @@ $pubdate = date('r', $vars['entity']->getTimeCreated());
 $title = htmlspecialchars($vars['entity']->name, ENT_NOQUOTES, 'UTF-8');
 
 if ($vars['entity']->description) {
-	$description = autop($vars['entity']->description);
+	$description = elgg_autop($vars['entity']->description);
 } else {
 	$description = '';
 }