diff options
| author | Evan Prodromou <evan@status.net> | 2009-12-12 16:15:47 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-12-12 16:15:47 -0500 |
| commit | cc063aedccd614d6e486d88921c7752ec5750551 (patch) | |
| tree | 603d7055f5b25fbff886c520ecddaee0e998ffd7 /actions/apitimelinegroup.php | |
| parent | b42b2e1d05867b2dd4cdb3e1b7e278c63001d355 (diff) | |
| parent | 78a649ca0af3ffbf1fd23d5ae9e84def7befa79e (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/apitimelinegroup.php')
| -rw-r--r-- | actions/apitimelinegroup.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index de13e7eb9..22c577f39 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -105,6 +105,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction function showTimeline() { $sitename = common_config('site', 'name'); + $avatar = $this->group->homepage_logo; $title = sprintf(_("%s timeline"), $this->group->nickname); $taguribase = common_config('integration', 'taguri'); $id = "tag:$taguribase:GroupTimeline:" . $this->group->id; @@ -117,13 +118,14 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction $this->group->nickname, $sitename ); + $logo = ($avatar) ? $avatar : User_group::defaultLogo(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() . @@ -136,7 +138,8 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction $link, $subtitle, null, - $selfuri + $selfuri, + $logo ); break; case 'json': |