diff options
| author | Hue Bastard <hubris@kevin.(none)> | 2009-12-08 21:28:11 +1000 |
|---|---|---|
| committer | Brion Vibber <brion@status.net> | 2009-12-11 16:15:22 -0800 |
| commit | 59e5958d3afa0a5613efbc1ed4546ce63946fe43 (patch) | |
| tree | 65736eb221001a02bdd5c73db702e3823b60728d /actions/apitimelinefriends.php | |
| parent | e2f0fc7b3f459a38c71c730c4006db42cab4724e (diff) | |
ticket 2055: added logos to Atom and RSS feeds
Diffstat (limited to 'actions/apitimelinefriends.php')
| -rw-r--r-- | actions/apitimelinefriends.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php index e84f77372..09ba7a969 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -110,6 +110,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction function showTimeline() { $profile = $this->user->getProfile(); + $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); $sitename = common_config('site', 'name'); $title = sprintf(_("%s and friends"), $this->user->nickname); $taguribase = common_config('integration', 'taguri'); @@ -121,13 +122,14 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction _('Updates from %1$s and friends on %2$s!'), $this->user->nickname, $sitename ); + $logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE); switch($this->format) { case 'xml': $this->showXmlTimeline($this->notices); break; case 'rss': - $this->showRssTimeline($this->notices, $title, $link, $subtitle); + $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo); break; case 'atom': @@ -144,7 +146,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction $this->showAtomTimeline( $this->notices, $title, $id, $link, - $subtitle, null, $selfuri + $subtitle, null, $selfuri, $logo ); break; case 'json': |