summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-03-02 03:40:43 -0500
committerEvan Prodromou <evan@status.net>2010-03-02 03:40:43 -0500
commite2578cfad68c45ca177c51997c4cc7c0abafbd9a (patch)
treea6a3b9ec360a88be535cde8e7426832b74e0ebe0
parent40ac7247979dc6f33f56b20c907d55deb6b9c815 (diff)
Revert "Show <activity:subject> and no activity actors for user feed"
This reverts commit c25fc8a4b51466f13c41efc0565bf15f78f6cb4d.
-rw-r--r--classes/Notice.php8
-rw-r--r--lib/atomnoticefeed.php16
-rw-r--r--lib/atomusernoticefeed.php11
3 files changed, 6 insertions, 29 deletions
diff --git a/classes/Notice.php b/classes/Notice.php
index c31d8bd69..7c424ee8a 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1090,7 +1090,7 @@ class Notice extends Memcached_DataObject
return $groups;
}
- function asAtomEntry($namespace=false, $source=false, $author=true)
+ function asAtomEntry($namespace=false, $source=false)
{
$profile = $this->getProfile();
@@ -1135,10 +1135,8 @@ class Notice extends Memcached_DataObject
$xs->element('title', null, $this->content);
- if ($author) {
- $xs->raw($profile->asAtomAuthor());
- $xs->raw($profile->asActivityActor());
- }
+ $xs->raw($profile->asAtomAuthor());
+ $xs->raw($profile->asActivityActor());
$xs->element('link', array('rel' => 'alternate',
'type' => 'text/html',
diff --git a/lib/atomnoticefeed.php b/lib/atomnoticefeed.php
index e4df731fe..3c3556cb9 100644
--- a/lib/atomnoticefeed.php
+++ b/lib/atomnoticefeed.php
@@ -107,19 +107,9 @@ class AtomNoticeFeed extends Atom10Feed
*/
function addEntryFromNotice($notice)
{
- $source = $this->showSource();
- $author = $this->showAuthor();
-
- $this->addEntryRaw($notice->asAtomEntry(false, $source, $author));
- }
-
- function showSource()
- {
- return true;
+ $this->addEntryRaw($notice->asAtomEntry());
}
- function showAuthor()
- {
- return true;
- }
}
+
+
diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index 6485aaa43..2ad8de455 100644
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -61,7 +61,6 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
if (!empty($user)) {
$profile = $user->getProfile();
$this->addAuthor($profile->nickname, $user->uri);
- $this->setActivitySubject($profile->asActivityNoun('subject'));
}
}
@@ -69,14 +68,4 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
{
return $this->user;
}
-
- function showSource()
- {
- return false;
- }
-
- function showAuthor()
- {
- return false;
- }
}