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 /classes/Notice.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 'classes/Notice.php')
| -rw-r--r-- | classes/Notice.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 3702dbcfa..c31d8bd69 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) + function asAtomEntry($namespace=false, $source=false, $author=true) { $profile = $this->getProfile(); @@ -1134,10 +1134,11 @@ class Notice extends Memcached_DataObject } $xs->element('title', null, $this->content); - $xs->element('summary', 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', |