some fixes for new no-dl layout

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

diff --git a/lib/atomgroupnoticefeed.php b/lib/atomgroupnoticefeed.php
index 39a1fd456efa02a3a89f553d4469f8ddbbf705a2..4e7f992662d53657fa6677018a902fdbe0dbb71d 100644 (file)
--- a/lib/atomgroupnoticefeed.php
+++ b/lib/atomgroupnoticefeed.php
@@ -85,8 +85,14 @@ class AtomGroupNoticeFeed extends AtomNoticeFeed
         $this->setId($self);
         $this->setSelfLink($self);
 
-        $this->addAuthorRaw($group->asAtomAuthor());
-        $this->setActivitySubject($group->asActivitySubject());
+        // 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->addLink($group->homeUrl());
     }