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/apitimelineuser.php | |
| parent | e9b733e7f036bc03353ae6dd7b096ea179698a4d (diff) | |
| parent | f3d27cc3ae92e2b7412dd998d7de7a2b58dc8e6a (diff) | |
Merge branch '0.9.x' into testing
Diffstat (limited to 'actions/apitimelineuser.php')
| -rw-r--r-- | actions/apitimelineuser.php | 6 |
1 files changed, 4 insertions, 2 deletions
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': |