3 files changed, 11 insertions, 32 deletions
diff --git a/views/rss/object/creator.php b/views/rss/object/creator.php
deleted file mode 100644
index 2bc6fd57d..000000000
--- a/views/rss/object/creator.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/**
- * 
- */
-
-if ($owner = $vars['entity']->getOwnerEntity()) {
-	echo "<dc:creator>{$owner->name}</dc:creator>";
-}
diff --git a/views/rss/object/default.php b/views/rss/object/default.php
index c7ff172f7..8c7d5d8e0 100644
--- a/views/rss/object/default.php
+++ b/views/rss/object/default.php
@@ -1,28 +1,25 @@
 <?php
 /**
- * Elgg default object view
+ * RSS object view
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $title = $vars['entity']->title;
 if (empty($title)) {
-	$subtitle = strip_tags($vars['entity']->description);
-	$title = substr($subtitle, 0, 32);
-	if (strlen($subtitle) > 32) {
-		$title .= ' ...';
-	}
+	$title = strip_tags($vars['entity']->description);
+	$title = elgg_get_excerpt($title, 32);
 }
 
-$permalink = htmlspecialchars($vars['entity']->getURL());
-$pubdate = date('r', $vars['entity']->time_created);
+$permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8');
+$pubdate = date('r', $vars['entity']->getTimeCreated());
 
-$creator = elgg_view('object/creator', $vars);
-$georss = elgg_view('object/georss', $vars);
-$extension = elgg_view('extensions/item');
+$description = elgg_autop($vars['entity']->description);
+
+$creator = elgg_view('page/components/creator', $vars);
+$georss = elgg_view('page/components/georss', $vars);
+$extension = elgg_view('extensions/item', $vars);
 
 $item = <<<__HTML
 <item>
@@ -30,7 +27,7 @@ $item = <<<__HTML
 	<pubDate>$pubdate</pubDate>
 	<link>$permalink</link>
 	<title><![CDATA[$title]]></title>
-	<description><![CDATA[{$vars['entity']->description}]]></description>
+	<description><![CDATA[$description]]></description>
 	$creator$georss$extension
 </item>
 
diff --git a/views/rss/object/georss.php b/views/rss/object/georss.php
deleted file mode 100644
index 8aa027519..000000000
--- a/views/rss/object/georss.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * 
- */
-
-if (($vars['entity'] instanceof Locatable) &&
-	($latitude = $vars['entity']->getLongitude()) && ($longitude = $vars['entity']->getLatitude())
-) {
-	echo "<georss:point>$latitude $longitude</georss:point>";
-}
-\ No newline at end of file