3 files changed, 36 insertions, 88 deletions
diff --git a/views/rss/object/album.php b/views/rss/object/album.php
deleted file mode 100644
index c66c0f7e9..000000000
--- a/views/rss/object/album.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-	/**
-	 * Tidypics Album RSS View
-	 */
-
-	// for now catch the albums view and ignore it
-	if (get_context() == "search" && get_input('search_viewtype') == "gallery") {
-	} else {
-
-	$album = $vars['entity'];
-
-	$base_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=';
-
-	// use fullsize image
-	$base_url_fullsize = $vars['url'] . 'action/tidypics/download?file_guid=';
-
-	// insert cover image if it exists image
-	if ($album->cover) {
-		// Set title
-		$vars['title'] = $album->title;
-		if (empty($vars['title'])) {
-			$title = $vars['config']->sitename;
-		} else if (empty($vars['config']->sitename)) {
-			$title = $vars['title'];
-		} else {
-			$title = $vars['config']->sitename . ": " . $vars['title'];
-		}
-		$album_cover_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&amp;size=thumb';
-?>		<image>
-			<url><?php echo $album_cover_url; ?></url>
-			<title><![CDATA[<?php echo $title; ?>]]></title>
-			<link><?php echo $album->getURL() . '?view=rss'; ?></link>
-
-		</image>
-<?php
-	}
-
-
-	$images = get_entities("object", "image", 0, "", 0, 0, false, 0, $album->guid);
-
-
-	foreach ($images as $image) {
-		$descr = '<p>' . get_entity($image->owner_guid)->name;
-		$descr .= ' ' . elgg_echo('tidypics:posted') . '</p>';
-		$descr .= "<p><img src=\"{$base_url}{$image->guid}&size=small\" /></p>";
-		$descr .= "<p>{$image->description}</p>";
-
-?>
-	<item>
-		<title><?php echo $image->title; ?></title>
-		<link><?php echo $base_url . $image->guid . '&amp;size=large'; ?></link>
-		<description><?php echo htmlentities($descr, ENT_QUOTES); ?></description>
-		<pubDate><?php echo date("r", $image->time_created); ?></pubDate>
-		<guid isPermaLink="true"><?php echo $image->getURL(); ?></guid>
-		<media:content url="<?php echo $base_url_fullsize . $image->guid . '&amp;view=inline'; ?>" medium="image" type="<?php echo $image->getMimeType(); ?>" />
-		<media:title><?php echo $image->title; ?></media:title>
-		<media:description><?php echo htmlentities($image->description); ?></media:description>
-		<media:thumbnail url="<?php echo $base_url . $image->guid . '&amp;size=thumb'; ?>"></media:thumbnail>
-	</item>
-
-<?php
-	}
-
-	}
-?>
-\ No newline at end of file
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/file.php b/views/rss/object/file.php
deleted file mode 100644
index ace3e28e6..000000000
--- a/views/rss/object/file.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-	/**
-	 * Tidypics RSS file object view - need to look into removing download link based on settings
-	 */
-
-	$title = $vars['entity']->title;
-	if (empty($title)) {
-		$title = substr($vars['entity']->description,0,32);
-		if (strlen($vars['entity']->description) > 32)
-			$title .= " ...";
-	}
-
-?>
-
-	<item>
-	  <guid isPermaLink='true'><?php echo $vars['entity']->getURL(); ?></guid>
-	  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>
-	  <link><?php echo $vars['entity']->getURL(); ?></link>
-	  <title><![CDATA[<?php echo $title; ?>]]></title>
-	  <description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>
-	  <enclosure url="<?php echo $vars['url']; ?>action/file/download?file_guid=<?php echo $vars['entity']->getGUID(); ?>" length="<?php echo $vars['entity']->size(); ?>" type="<?php echo $vars['entity']->getMimeType(); ?>" />
-	</item>