From 59e5958d3afa0a5613efbc1ed4546ce63946fe43 Mon Sep 17 00:00:00 2001
From: Hue Bastard <hubris@kevin.(none)>
Date: Tue, 8 Dec 2009 21:28:11 +1000
Subject: ticket 2055: added logos to Atom and RSS feeds

---
 actions/apitimelineuser.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'actions/apitimelineuser.php')

diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index ca1d21772..14c62a52e 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -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,7 +141,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
         case 'rss':
             $this->showRssTimeline(
                 $this->notices, $title, $link,
-                $subtitle, $suplink
+                $subtitle, $suplink, $logo
             );
             break;
         case 'atom':
@@ -153,7 +155,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
             }
             $this->showAtomTimeline(
                 $this->notices, $title, $id, $link,
-                $subtitle, $suplink, $selfuri
+                $subtitle, $suplink, $selfuri, $logo
             );
             break;
         case 'json':
-- 
cgit v1.2.3-54-g00ecf