Merge branch '0.9.x' into 1.0.x

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

diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index ec368f5ca1648b9c447bbea3abe01a6e800db95c..5ca089b859a85d753f7af13903e598e9eb876d95 100644 (file)
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -60,8 +60,8 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
         $this->user = $user;
         if (!empty($user)) {
             $profile = $user->getProfile();
-            $this->addAuthor($profile->nickname, $user->uri);
-            $this->setActivitySubject($profile->asActivityNoun('subject'));
+            $ao = ActivityObject::fromProfile($profile);
+            $this->addAuthorRaw($ao->asString('author'));
         }
 
         // TRANS: Title in atom user notice feed. %s is a user name.