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/object/creator.php |  8 --------
 views/rss/object/default.php | 17 +++++++----------
 views/rss/object/georss.php  | 10 ----------
 3 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 views/rss/object/creator.php
 delete mode 100644 views/rss/object/georss.php

(limited to 'views/rss/object')

diff --git a/views/rss/object/creator.php b/views/rss/object/creator.php
deleted file mode 100644
index 2bc6fd57d..000000000
--- a/views/rss/object/creator.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/**
- * 
- */
-
-if ($owner = $vars['entity']->getOwnerEntity()) {
-	echo "<dc:creator>{$owner->name}</dc:creator>";
-}
diff --git a/views/rss/object/default.php b/views/rss/object/default.php
index 29e5d4591..b5d269ac7 100644
--- a/views/rss/object/default.php
+++ b/views/rss/object/default.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Elgg default object view
+ * RSS object view
  *
  * @package Elgg
  * @subpackage Core
@@ -8,18 +8,15 @@
 
 $title = $vars['entity']->title;
 if (empty($title)) {
-	$subtitle = strip_tags($vars['entity']->description);
-	$title = substr($subtitle, 0, 32);
-	if (strlen($subtitle) > 32) {
-		$title .= ' ...';
-	}
+	$title = strip_tags($vars['entity']->description);
+	$title = elgg_get_excerpt($title, 32);
 }
 
-$permalink = htmlspecialchars($vars['entity']->getURL());
-$pubdate = date('r', $vars['entity']->time_created);
+$permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8');
+$pubdate = date('r', $vars['entity']->getTimeCreated());
 
-$creator = elgg_view('object/creator', $vars);
-$georss = elgg_view('object/georss', $vars);
+$creator = elgg_view('page/components/creator', $vars);
+$georss = elgg_view('page/components/georss', $vars);
 $extension = elgg_view('extensions/item');
 
 $item = <<<__HTML
diff --git a/views/rss/object/georss.php b/views/rss/object/georss.php
deleted file mode 100644
index 8aa027519..000000000
--- a/views/rss/object/georss.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * 
- */
-
-if (($vars['entity'] instanceof Locatable) &&
-	($latitude = $vars['entity']->getLongitude()) && ($longitude = $vars['entity']->getLatitude())
-) {
-	echo "<georss:point>$latitude $longitude</georss:point>";
-}
\ No newline at end of file
-- 
cgit v1.2.3