From 4106d50727d5a56ec1442b16e182fbd9acc6b167 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 29 Oct 2011 15:07:43 -0400
Subject: Fixes #3201 updates rss view type for core Elgg

---
 views/rss/annotation/default.php         | 34 --------------------------------
 views/rss/annotation/generic_comment.php | 33 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 34 deletions(-)
 delete mode 100644 views/rss/annotation/default.php
 create mode 100644 views/rss/annotation/generic_comment.php

(limited to 'views/rss/annotation')

diff --git a/views/rss/annotation/default.php b/views/rss/annotation/default.php
deleted file mode 100644
index 98329f132..000000000
--- a/views/rss/annotation/default.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Elgg RSS view for a generic comment
- *
- * @package Elgg
- * @subpackage Core
- */
-
-$entity = get_entity($vars['annotation']->entity_guid);
-
-$title = substr($vars['annotation']->value, 0, 32);
-if (strlen($vars['annotation']->value) > 32) {
-	$title .= " ...";
-}
-
-$permalink = $entity->getURL();
-$pubdate = date('r', $entity->time_created);
-
-$creator = elgg_view('object/creator', array('entity' => $entity));
-$georss = elgg_view('object/georss', array('entity' => $entity));
-$extensions = elgg_view('extensions/item');
-
-$item = <<<__HTML
-<item>
-	<guid isPermaLink='true'>$permalink#{$vars['annotation']->id}</guid>
-	<pubDate>$pubdate</pubDate>
-	<link>$permalink#{$vars['annotation']->id}</link>
-	<title><![CDATA[$title]]></title>
-	<description><![CDATA[{$vars['annotation']->value}]]></description>
-	$creator$georss$extensions
-</item>
-__HTML;
-
-echo $item;
diff --git a/views/rss/annotation/generic_comment.php b/views/rss/annotation/generic_comment.php
new file mode 100644
index 000000000..9e9107568
--- /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');
+
+$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;
-- 
cgit v1.2.3