aboutsummaryrefslogtreecommitdiff
path: root/views/rss/object
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-10-29 15:10:48 -0700
committerBrett Profitt <brett.profitt@gmail.com>2011-10-29 15:10:48 -0700
commit6971caddb2245bec34fd23927f6f093e5b28c1ea (patch)
treea8c78a2b8f79201e04696687ad095e81eeee1805 /views/rss/object
parent3e4641537ff66b7e634f83e7a3386df9273ec9ff (diff)
parent9046723db0c21cd0995ec87e69734bd1f0edcae6 (diff)
downloadelgg-6971caddb2245bec34fd23927f6f093e5b28c1ea.tar.gz
elgg-6971caddb2245bec34fd23927f6f093e5b28c1ea.tar.bz2
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'views/rss/object')
-rw-r--r--views/rss/object/creator.php8
-rw-r--r--views/rss/object/default.php17
-rw-r--r--views/rss/object/georss.php10
3 files changed, 7 insertions, 28 deletions
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