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/all.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/all.php')
| -rw-r--r-- | actions/all.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/actions/all.php b/actions/all.php index f1786462e..61cedce74 100644 --- a/actions/all.php +++ b/actions/all.php @@ -99,19 +99,17 @@ class AllAction extends ProfileAction sprintf(_('Feed for friends of %s (RSS 1.0)'), $this->user->nickname)), new Feed(Feed::RSS2, common_local_url( - 'api', array( - 'apiaction' => 'statuses', - 'method' => 'friends_timeline', - 'argument' => $this->user->nickname.'.rss' + 'ApiTimelineFriends', array( + 'format' => 'rss', + 'id' => $this->user->nickname ) ), sprintf(_('Feed for friends of %s (RSS 2.0)'), $this->user->nickname)), new Feed(Feed::ATOM, common_local_url( - 'api', array( - 'apiaction' => 'statuses', - 'method' => 'friends_timeline', - 'argument' => $this->user->nickname.'.atom' + 'ApiTimelineFriends', array( + 'format' => 'atom', + 'id' => $this->user->nickname ) ), sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname)) |