1 files changed, 29 insertions, 44 deletions
diff --git a/views/rss/object/default.php b/views/rss/object/default.php
index 060e471c4..8c7d5d8e0 100644
--- a/views/rss/object/default.php
+++ b/views/rss/object/default.php
@@ -1,51 +1,36 @@
 <?php
+/**
+ * RSS object view
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
 
-	/**
-	 * Elgg default object view
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
+$title = $vars['entity']->title;
+if (empty($title)) {
+	$title = strip_tags($vars['entity']->description);
+	$title = elgg_get_excerpt($title, 32);
+}
 
-	 * @author Curverider Ltd
+$permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8');
+$pubdate = date('r', $vars['entity']->getTimeCreated());
 
-	 * @link http://elgg.org/
-	 */
+$description = elgg_autop($vars['entity']->description);
 
-	$title = $vars['entity']->title;
-	if (empty($title)) {
-		$subtitle = strip_tags($vars['entity']->description);
-		$title = substr($subtitle,0,32);
-		if (strlen($subtitle) > 32)
-			$title .= " ...";
-	}
+$creator = elgg_view('page/components/creator', $vars);
+$georss = elgg_view('page/components/georss', $vars);
+$extension = elgg_view('extensions/item', $vars);
 
-?>
+$item = <<<__HTML
+<item>
+	<guid isPermaLink="true">$permalink</guid>
+	<pubDate>$pubdate</pubDate>
+	<link>$permalink</link>
+	<title><![CDATA[$title]]></title>
+	<description><![CDATA[$description]]></description>
+	$creator$georss$extension
+</item>
 
-	<item>
-	  <guid isPermaLink='true'><?php echo htmlspecialchars($vars['entity']->getURL()); ?></guid>
-	  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>
-	  <link><?php echo htmlspecialchars($vars['entity']->getURL()); ?></link>
-	  <title><![CDATA[<?php echo $title; ?>]]></title>
-	  <description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>
-	  <?php
-			$owner = $vars['entity']->getOwnerEntity();
-			if ($owner)
-			{
-?>
-	  <dc:creator><?php echo $owner->name; ?></dc:creator>
-<?php
-			}
-	  ?>
-	  <?php
-			if (
-				($vars['entity'] instanceof Locatable) &&
-				($vars['entity']->getLongitude()) &&
-				($vars['entity']->getLatitude())
-			) {
-				?>
-				<georss:point><?php echo $vars['entity']->getLatitude(); ?> <?php echo $vars['entity']->getLongitude(); ?></georss:point>
-				<?php
-			}
-	  ?>
-	  <?php echo elgg_view('extensions/item'); ?>
-	</item>
+__HTML;
+
+echo $item;