summaryrefslogtreecommitdiff
path: root/classes/Notice.php
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-03-03 17:35:18 -0800
committerZach Copley <zach@status.net>2010-03-03 20:58:34 -0800
commitf210cadfecc4f87e1fb8e35cd784a7010c443c31 (patch)
tree8c900b41211719b4e2267126f670ad97a3230c27 /classes/Notice.php
parentb97ac60209fdec3f2d521f7c9d54acca6d00d274 (diff)
Revert "Revert "Show <activity:subject> and no activity actors for user feed""
This reverts commit e2578cfad68c45ca177c51997c4cc7c0abafbd9a.
Diffstat (limited to 'classes/Notice.php')
-rw-r--r--classes/Notice.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/classes/Notice.php b/classes/Notice.php
index 97cb3b8fb..4c7e6ab4b 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1106,7 +1106,7 @@ class Notice extends Memcached_DataObject
return $groups;
}
- function asAtomEntry($namespace=false, $source=false)
+ function asAtomEntry($namespace=false, $source=false, $author=true)
{
$profile = $this->getProfile();
@@ -1151,8 +1151,10 @@ class Notice extends Memcached_DataObject
$xs->element('title', null, $this->content);
- $xs->raw($profile->asAtomAuthor());
- $xs->raw($profile->asActivityActor());
+ if ($author) {
+ $xs->raw($profile->asAtomAuthor());
+ $xs->raw($profile->asActivityActor());
+ }
$xs->element('link', array('rel' => 'alternate',
'type' => 'text/html',