diff options
| author | Brenda Wallace <shiny@cpan.org> | 2009-10-30 19:21:16 +1300 |
|---|---|---|
| committer | Brenda Wallace <shiny@cpan.org> | 2009-10-30 19:21:16 +1300 |
| commit | 4892073c842bcb8e11bffeb829e99ac865c07924 (patch) | |
| tree | 65b79b3345b3a37d901ef460715cba3957d2b923 /actions/public.php | |
| parent | 54c64a0cf1160db174934799750d7eec83f4f433 (diff) | |
| parent | 02131db1c976831241b61e205ccda9e3232c4fe2 (diff) | |
Merge commit 'mainline/0.9.x' into 0.9.x
Diffstat (limited to 'actions/public.php')
| -rw-r--r-- | actions/public.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/actions/public.php b/actions/public.php index 4b71e5853..982dfde15 100644 --- a/actions/public.php +++ b/actions/public.php @@ -150,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)'))); } |