diff options
author | Zach Copley <zach@status.net> | 2010-03-02 00:38:50 -0800 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2010-03-02 00:38:50 -0800 |
commit | f68e3dfba5a1b745aceaf07bed8b92c53f3708aa (patch) | |
tree | 36f68a3b1737a599371310390215f92c1052aa42 /lib/atomusernoticefeed.php | |
parent | 9816b35063b75f1aa051d8b1ecefe716d99f5dc4 (diff) | |
parent | 40ac7247979dc6f33f56b20c907d55deb6b9c815 (diff) |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
don't duplicate title in summary in Atom output per RFC4287 4.2.13
Show <activity:subject> and no activity actors for user feed
Revert "show service debug info"
Diffstat (limited to 'lib/atomusernoticefeed.php')
-rw-r--r-- | lib/atomusernoticefeed.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php index 2ad8de455..6485aaa43 100644 --- a/lib/atomusernoticefeed.php +++ b/lib/atomusernoticefeed.php @@ -61,6 +61,7 @@ class AtomUserNoticeFeed extends AtomNoticeFeed if (!empty($user)) { $profile = $user->getProfile(); $this->addAuthor($profile->nickname, $user->uri); + $this->setActivitySubject($profile->asActivityNoun('subject')); } } @@ -68,4 +69,14 @@ class AtomUserNoticeFeed extends AtomNoticeFeed { return $this->user; } + + function showSource() + { + return false; + } + + function showAuthor() + { + return false; + } } |