Refs #3150 can pass description to RSS page shell

diff --git a/views/rss/page/default.php b/views/rss/page/default.php
index 246ec972e272eea06597e9f3da5994f570ea2cf1..c973e3fd085b3f9269cae4d9e1a3be666ac48e45 100644 (file)
--- 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');
@@ -23,17 +19,28 @@ if (empty($vars['title'])) {
 // Remove RSS from URL
 $url = str_replace('?view=rss', '', full_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;