2 files changed, 36 insertions, 61 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/event_calendar.php b/views/rss/object/event_calendar.php
deleted file mode 100644
index 45b2d847a..000000000
--- a/views/rss/object/event_calendar.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-	/**
-	 * Elgg default object view
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-
-	 * @author Curverider Ltd
-
-	 * @link http://elgg.org/
-	 */
-
-	elgg_load_library('elgg:event_calendar');
-	$title = $vars['entity']->title;
-	
-	$event_items = event_calendar_get_formatted_full_items($vars['entity']);
-	$items = array();
-	foreach($event_items as $item) {
-		if (trim($item->value)) {
-			$items[] = '<b>'.$item->title.'</b>: '.$item->value;
-		}
-	}
-	
-	$description = '<p>'.implode('<br />',$items).'</p>';
-	
-	if ($vars['entity']->long_description) {
-		$description .= '<p>'.autop($vars['entity']->long_description).'</p>';
-	} else {
-		$description .=  '<p>'.$vars['entity']->description.'</p>';
-	}
-
-?>
-
-	<item>
-	  <guid isPermaLink='true'><?php echo htmlspecialchars($vars['entity']->getURL()); ?></guid>
-	  <link><?php echo htmlspecialchars($vars['entity']->getURL()); ?></link>
-	  <title><![CDATA[<?php echo $title; ?>]]></title>
-	  <description><![CDATA[<?php echo $description; ?>]]></description>
-	  <?php
-			$owner = $vars['entity']->getOwnerEntity();
-			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>