[XML/HTML Outputter] General improvements and refactoring as well as some bug fixes

[quix0rs-gnu-social.git] / lib / atomgroupnoticefeed.php

diff --git a/lib/atomgroupnoticefeed.php b/lib/atomgroupnoticefeed.php
index 4e7f992662d53657fa6677018a902fdbe0dbb71d..945d9fca2f54be2bc7f21da03b6e3f867d7d284d 100644 (file)
--- a/lib/atomgroupnoticefeed.php
+++ b/lib/atomgroupnoticefeed.php
@@ -85,14 +85,9 @@ class AtomGroupNoticeFeed extends AtomNoticeFeed
         $this->setId($self);
         $this->setSelfLink($self);
 
-        // For groups, we generate an author _AND_ an <activity:subject>
-        // Versions of StatusNet under 0.9.7 treat <author> as a person
-        // XXX: remove this workaround in future versions
-
         $ao = ActivityObject::fromGroup($group);
 
-        $this->addAuthorRaw($ao->asString('author').
-                            $ao->asString('activity:subject'));
+        $this->addAuthorRaw($ao->asString('author'));
 
         $this->addLink($group->homeUrl());
     }
@@ -119,6 +114,6 @@ class AtomGroupNoticeFeed extends AtomNoticeFeed
 
         $attrs['member_count'] = $this->group->getMemberCount();
 
-        $this->element('statusnet:group_info', $attrs, null);
+        $this->element('statusnet:group_info', $attrs);
     }
 }