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/apitimelinepublic.php | |
| parent | e9b733e7f036bc03353ae6dd7b096ea179698a4d (diff) | |
| parent | f3d27cc3ae92e2b7412dd998d7de7a2b58dc8e6a (diff) | |
Merge branch '0.9.x' into testing
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': |