X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapitimelineuser.php;h=ed9104905de1f316c1066df4a9fdbf3332e5836f;hb=b2e8d8407cc7f1abb5e8767cd3403ac356775eaa;hp=285735fd1a6ac53122dee6b27656e40e1bb05973;hpb=861e0f02270c43e5303471ae9c419662cac76142;p=quix0rs-gnu-social.git

diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 285735fd1a..ed9104905d 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -78,7 +78,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
@@ -112,6 +112,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
     function showTimeline()
     {
         $profile = $this->user->getProfile();
+        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
 
         $sitename   = common_config('site', 'name');
         $title      = sprintf(_("%s timeline"), $this->user->nickname);
@@ -125,6 +126,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
             _('Updates from %1$s on %2$s!'),
             $this->user->nickname, $sitename
         );
+        $logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE);
 
         // FriendFeed's SUP protocol
         // Also added RSS and Atom feeds
@@ -139,28 +141,29 @@ class ApiTimelineUserAction extends ApiBareAuthAction
         case 'rss':
             $this->showRssTimeline(
                 $this->notices, $title, $link,
-                $subtitle, $suplink
+                $subtitle, $suplink, $logo
             );
             break;
         case 'atom':
-            if (isset($apidata['api_arg'])) {
+            $id = $this->arg('id');
+            if ($id) {
                 $selfuri = common_root_url() .
                     'api/statuses/user_timeline/' .
-                    $apidata['api_arg'] . '.atom';
+                    rawurlencode($id) . '.atom';
             } else {
                 $selfuri = common_root_url() .
                     'api/statuses/user_timeline.atom';
             }
             $this->showAtomTimeline(
                 $this->notices, $title, $id, $link,
-                $subtitle, $suplink, $selfuri
+                $subtitle, $suplink, $selfuri, $logo
             );
             break;
         case 'json':
             $this->showJsonTimeline($this->notices);
             break;
         default:
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             break;
         }