4 files changed, 10 insertions, 85 deletions
diff --git a/views/rss/object/album.php b/views/rss/object/album.php
deleted file mode 100644
index f880b56d6..000000000
--- a/views/rss/object/album.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Album RSS view
- *
- * @uses $vars['entity'] TidypicsAlbum
- *
- * @author Cash Costello
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
- */
-
-$full_view = elgg_extract('full_view', $vars, false);
-
-if ($full_view) {
-	echo elgg_view('object/album/full', $vars);
-} else {
-	echo elgg_view('object/album/summary', $vars);
-}
diff --git a/views/rss/object/album/full.php b/views/rss/object/album/full.php
deleted file mode 100644
index b1f5a567b..000000000
--- a/views/rss/object/album/full.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * List photos in an album for RSS
- *
- * @uses $vars['entity'] TidypicsAlbum
- *
- * @author Cash Costello
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
- */
-
-$limit = (int)get_input('limit', 20);
-
-echo elgg_list_entities(array(
-	'type' => 'object',
-	'subtype' => 'image',
-	'container_guid' => $vars['entity']->getGUID(),
-	'limit' => $limit,
-	'full_view' => false,
-));
diff --git a/views/rss/object/album/summary.php b/views/rss/object/default.php
index b6dc8f003..8c7d5d8e0 100644
--- a/views/rss/object/album/summary.php
+++ b/views/rss/object/default.php
@@ -1,18 +1,21 @@
 <?php
 /**
- * Individual album summary view for RSS
+ * RSS object view
  *
- * @uses $vars['entity'] TidypicsAlbum
- *
- * @author Cash Costello
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
+ * @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());
 
-$title = $vars['entity']->getTitle();
-$description = autop($vars['entity']->description);
+$description = elgg_autop($vars['entity']->description);
 
 $creator = elgg_view('page/components/creator', $vars);
 $georss = elgg_view('page/components/georss', $vars);
diff --git a/views/rss/object/image.php b/views/rss/object/image.php
deleted file mode 100644
index e3b67ee74..000000000
--- a/views/rss/object/image.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Individual image RSS view
- *
- * @uses $vars['entity'] TidypicsImage
- *
- * @author Cash Costello
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
- */
-
-$permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8');
-$pubdate = date('r', $vars['entity']->getTimeCreated());
-
-$title = $vars['entity']->getTitle();
-$description = autop($vars['entity']->description);
-
-$creator = elgg_view('page/components/creator', $vars);
-$georss = elgg_view('page/components/georss', $vars);
-$extension = elgg_view('extensions/item', $vars);
-
-$thumbnail_url = $vars['entity']->getIconURL('tiny');
-$download_url = $vars['entity']->getIconURL('large');
-
-$mime_type = $vars['entity']->getMimeType();
-
-$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
-	<media:content url="$download_url" medium="image" type="$mime_type" />
-	<media:title><![CDATA[$title]]></media:title>
-	<media:description><![CDATA[$description]]></media:description>
-	<media:thumbnail url="$thumbnail_url"></media:thumbnail>
-</item>
-
-__HTML;
-
-echo $item;