2 files changed, 33 insertions, 50 deletions
diff --git a/views/rss/annotation/default.php b/views/rss/annotation/default.php
deleted file mode 100644
index 1433ba9b0..000000000
--- a/views/rss/annotation/default.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-	/**
-	 * Elgg generic comment
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-
-	 * @author Curverider Ltd
-
-	 * @link http://elgg.org/
-	 * 
-	 */
-
-
-	$vars['entity'] = get_entity($vars['annotation']->entity_guid);
-	$title = substr($vars['annotation']->value,0,32);
-		if (strlen($vars['annotation']->value) > 32)
-			$title .= " ...";
-	
-?>
-
-	<item>
-	  <guid isPermaLink='true'><?php echo $vars['entity']->getURL(); ?>#<?php echo $vars['annotation']->id; ?></guid>
-	  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>
-	  <link><?php echo $vars['entity']->getURL(); ?>#<?php echo $vars['annotation']->id; ?></link>
-	  <title><![CDATA[<?php echo $title; ?>]]></title>
-	  <description><![CDATA[<?php echo (autop($vars['annotation']->value)); ?>]]></description>
-	  <?php
-			$owner = get_entity($vars['entity']->owner);
-			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>
diff --git a/views/rss/annotation/generic_comment.php b/views/rss/annotation/generic_comment.php
new file mode 100644
index 000000000..de652fc8e
--- /dev/null
+++ b/views/rss/annotation/generic_comment.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Elgg RSS view for a generic_comment annotation
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+$annotation = $vars['annotation'];
+
+$poster = $annotation->getOwnerEntity();
+$poster_name = htmlspecialchars($poster->name, ENT_NOQUOTES, 'UTF-8');
+$pubdate = date('r', $annotation->getTimeCreated());
+$permalink = $annotation->getURL();
+
+$title = elgg_echo('generic_comment:title', array($poster_name));
+
+$creator = elgg_view('page/components/creator', array('entity' => $annotation));
+$extensions = 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[{$vars['annotation']->value}]]></description>
+	$creator$extensions
+</item>
+
+__HTML;
+
+echo $item;