More Favorite pluginification (favecount, cache, menus(favecount, cache, menus))

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

diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index 3398cc8b4d88e48af695b28c836010a47618f285..b899ecff4aa4c15da5173ddf9f40f81b49cc9c72 100644 (file)
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -64,24 +64,9 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
 
             $ao = ActivityObject::fromProfile($profile);
 
-            $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.
+            array_push($ao->extra, $profile->profileInfo($cur));
 
             $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');