X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fatomusernoticefeed.php;h=b899ecff4aa4c15da5173ddf9f40f81b49cc9c72;hb=0fa00d510626f9131ca94edaf303b4c09691259f;hp=fb0ac5f8313c88cd80504cfca650fb393d4a8d8d;hpb=880b1b666eeaedee2c9570142b2d0cd56f1d96f1;p=quix0rs-gnu-social.git

diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index fb0ac5f831..b899ecff4a 100644
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -66,22 +66,7 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
 
             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.
-
             $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');