2 files changed, 36 insertions, 47 deletions
diff --git a/views/rss/object/default.php b/views/rss/object/default.php
new file mode 100644
index 000000000..8c7d5d8e0
--- /dev/null
+++ b/views/rss/object/default.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * RSS 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);
+}
+
+$permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8');
+$pubdate = date('r', $vars['entity']->getTimeCreated());
+
+$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>
+	<guid isPermaLink="true">$permalink</guid>
+	<pubDate>$pubdate</pubDate>
+	<link>$permalink</link>
+	<title><![CDATA[$title]]></title>
+	<description><![CDATA[$description]]></description>
+	$creator$georss$extension
+</item>
+
+__HTML;
+
+echo $item;
diff --git a/views/rss/object/videolist_item.php b/views/rss/object/videolist_item.php
deleted file mode 100644
index 41d89fadf..000000000
--- a/views/rss/object/videolist_item.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Elgg default object view
- *
- * @package Elgg
- * @subpackage Core
- */
-
-$title = $vars['entity']->title;
-if (empty($title)) {
-	$subtitle = strip_tags($vars['entity']->description);
-	$title = substr($subtitle, 0, 32);
-	if (strlen($subtitle) > 32) {
-		$title .= ' ...';
-	}
-}
-
-set_input('view', 'default');
-
-$description = elgg_view("videolist/watch/".$vars['entity']->videotype, array(
-	'entity' => $vars['entity'],
-));
-
-set_input('view', 'rss');
-
-$description .= $vars['entity']->description;
-
-$permalink = htmlspecialchars($vars['entity']->getURL());
-$pubdate = date('r', $vars['entity']->time_created);
-
-$creator = elgg_view('object/creator', $vars);
-$georss = elgg_view('object/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>
-
-__HTML;
-
-echo $item;