summaryrefslogtreecommitdiff
path: root/actions/apitimelinegroup.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/apitimelinegroup.php
parente2f0fc7b3f459a38c71c730c4006db42cab4724e (diff)
ticket 2055: added logos to Atom and RSS feeds
Diffstat (limited to 'actions/apitimelinegroup.php')
-rw-r--r--actions/apitimelinegroup.php7
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':