summaryrefslogtreecommitdiff
path: root/actions/apitimelinefavorites.php
diff options
context:
space:
mode:
authorHue Bastard <hubris@kevin.(none)>2009-12-08 21:28:11 +1000
committerBrion Vibber <brion@status.net>2009-12-11 16:15:22 -0800
commit59e5958d3afa0a5613efbc1ed4546ce63946fe43 (patch)
tree65736eb221001a02bdd5c73db702e3823b60728d /actions/apitimelinefavorites.php
parente2f0fc7b3f459a38c71c730c4006db42cab4724e (diff)
ticket 2055: added logos to Atom and RSS feeds
Diffstat (limited to 'actions/apitimelinefavorites.php')
-rw-r--r--actions/apitimelinefavorites.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index f84d7b4cb..77e5cea1b 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -101,6 +101,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
function showTimeline()
{
$profile = $this->user->getProfile();
+ $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
$sitename = common_config('site', 'name');
$title = sprintf(
@@ -121,20 +122,21 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
$profile->getBestName(),
$this->user->nickname
);
+ $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, null, $logo);
break;
case 'atom':
$selfuri = common_root_url() .
ltrim($_SERVER['QUERY_STRING'], 'p=');
$this->showAtomTimeline(
$this->notices, $title, $id, $link, $subtitle,
- null, $selfuri
+ null, $selfuri, $logo
);
break;
case 'json':