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/showstream.php | |
| parent | 54c64a0cf1160db174934799750d7eec83f4f433 (diff) | |
| parent | 02131db1c976831241b61e205ccda9e3232c4fe2 (diff) | |
Merge commit 'mainline/0.9.x' into 0.9.x
Diffstat (limited to 'actions/showstream.php')
| -rw-r--r-- | actions/showstream.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/actions/showstream.php b/actions/showstream.php index de7100b1d..4f4806037 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -128,17 +128,17 @@ class ShowstreamAction extends ProfileAction sprintf(_('Notice feed for %s (RSS 1.0)'), $this->user->nickname)), new Feed(Feed::RSS2, - common_local_url('api', - array('apiaction' => 'statuses', - 'method' => 'user_timeline', - 'argument' => $this->user->nickname.'.rss')), + common_local_url('ApiTimelineUser', + array( + 'id' => $this->user->nickname, + 'format' => 'rss')), sprintf(_('Notice feed for %s (RSS 2.0)'), $this->user->nickname)), new Feed(Feed::ATOM, - common_local_url('api', - array('apiaction' => 'statuses', - 'method' => 'user_timeline', - 'argument' => $this->user->nickname.'.atom')), + common_local_url('ApiTimelineUser', + array( + 'id' => $this->user->nickname, + 'format' => 'atom')), sprintf(_('Notice feed for %s (Atom)'), $this->user->nickname)), new Feed(Feed::FOAF, |