Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

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

diff --git a/lib/atomgroupnoticefeed.php b/lib/atomgroupnoticefeed.php
index 5b6fcf42952b1e24ee255234b16157907b8cfb07..817191b64aecee4cfffd40392fa778340688e89b 100644 (file)
--- a/lib/atomgroupnoticefeed.php
+++ b/lib/atomgroupnoticefeed.php
@@ -85,10 +85,23 @@ 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'));
 
+        $depMsg = 'Deprecation warning: activity:subject is present '
+            . 'only for backward compatibility. It will be '
+            . 'removed in the next version of StatusNet.';
+
+        $this->addAuthorRaw(
+            "<!--$depMsg-->\n"
+            . $ao->asString('activity:subject')
+        );
+
         $this->addLink($group->homeUrl());
     }