diff options
| author | Evan Prodromou <evan@status.net> | 2009-10-31 14:47:21 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-10-31 14:47:21 -0400 |
| commit | 44ce8e2fcd1eba0d0f2723c246c1a021614e2763 (patch) | |
| tree | eacb1d8470354e7f7d55b0ca185690acf45cecd7 /actions/public.php | |
| parent | bed942271d772e6eed36c4c012c48460510564f1 (diff) | |
| parent | 8a333805df5fc3786ef8abe1d71421fb9270ff7f (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/public.php')
| -rw-r--r-- | actions/public.php | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/actions/public.php b/actions/public.php index 73fad182a..982dfde15 100644 --- a/actions/public.php +++ b/actions/public.php @@ -131,6 +131,13 @@ class PublicAction extends Action return _('Public timeline'); } } + + function extraHead() + { + parent::extraHead(); + $this->element('meta', array('http-equiv' => 'X-XRDS-Location', + 'content' => common_local_url('publicxrds'))); + } /** * Output <head> elements for RSS and Atom feeds @@ -143,14 +150,12 @@ class PublicAction extends Action return array(new Feed(Feed::RSS1, common_local_url('publicrss'), _('Public Stream Feed (RSS 1.0)')), new Feed(Feed::RSS2, - common_local_url('api', - array('apiaction' => 'statuses', - 'method' => 'public_timeline.rss')), + common_local_url('ApiTimelinePublic', + array('format' => 'rss')), _('Public Stream Feed (RSS 2.0)')), new Feed(Feed::ATOM, - common_local_url('api', - array('apiaction' => 'statuses', - 'method' => 'public_timeline.atom')), + common_local_url('ApiTimelinePublic', + array('format' => 'atom')), _('Public Stream Feed (Atom)'))); } |