diff options
| author | Evan Prodromou <evan@status.net> | 2009-12-15 16:24:52 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-12-15 16:24:52 -0500 |
| commit | 2a1468ec8b2918553b490ddaef6bdede3e2d5b1b (patch) | |
| tree | c94a68a1239a5a3c35d5564323967fcd4ff14523 /actions/apitimelinefavorites.php | |
| parent | e9b733e7f036bc03353ae6dd7b096ea179698a4d (diff) | |
| parent | f3d27cc3ae92e2b7412dd998d7de7a2b58dc8e6a (diff) | |
Merge branch '0.9.x' into testing
Diffstat (limited to 'actions/apitimelinefavorites.php')
| -rw-r--r-- | actions/apitimelinefavorites.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php index f84d7b4cb..008e04212 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); 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': |