X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fatomusernoticefeed.php;h=7b7f0a749f32910598d9b7c357b325422f95fdf3;hb=89704bcdeec2bac07b0528d21cd2d15bedf8c4ec;hp=fb0ac5f8313c88cd80504cfca650fb393d4a8d8d;hpb=0291c6f7cd07cfb6845215ab33f8a56b417c0d1c;p=quix0rs-gnu-social.git

diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index fb0ac5f831..7b7f0a749f 100644
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -62,26 +62,11 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
 
             $profile = $user->getProfile();
 
-            $ao = ActivityObject::fromProfile($profile);
-
-            array_push($ao->extra, $profile->profileInfo($cur));
-
-            // XXX: For users, we generate an author _AND_ an <activity:subject>
-            // This is for backward compatibility with clients (especially
-            // StatusNet's clients) that assume the Atom will conform to an
-            // older version of the Activity Streams API. Subject should be
-            // removed in future versions of StatusNet.
+            $ao = $profile->asActivityObject();
+            
+            array_push($ao->extra, $profile->profileInfo($this->scoped));
 
             $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')
-            );
         }
 
         // TRANS: Title in atom user notice feed. %s is a user name.
@@ -97,9 +82,7 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
         );
         $this->setSubtitle($subtitle);
 
-        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-        $logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE);
-        $this->setLogo($logo);
+        $this->setLogo($profile->avatarUrl(AVATAR_PROFILE_SIZE));
 
         $this->setUpdated('now');