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/apitimelinepublic.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/apitimelinepublic.php')
| -rw-r--r-- | actions/apitimelinepublic.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php index 7a8504259..633f3c36e 100644 --- a/actions/apitimelinepublic.php +++ b/actions/apitimelinepublic.php @@ -103,6 +103,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction function showTimeline() { $sitename = common_config('site', 'name'); + $sitelogo = (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png'); $title = sprintf(_("%s public timeline"), $sitename); $taguribase = common_config('integration', 'taguri'); $id = "tag:$taguribase:PublicTimeline"; @@ -114,13 +115,13 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction $this->showXmlTimeline($this->notices); break; case 'rss': - $this->showRssTimeline($this->notices, $title, $link, $subtitle); + $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $sitelogo); break; case 'atom': $selfuri = common_root_url() . 'api/statuses/public_timeline.atom'; $this->showAtomTimeline( $this->notices, $title, $id, $link, - $subtitle, null, $selfuri + $subtitle, null, $selfuri, $sitelogo ); break; case 'json': |