diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-03-07 09:46:35 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-03-07 09:46:35 -0800 |
| commit | bffd931c37618c8623eb2465150ee8d9d85b7184 (patch) | |
| tree | 64b78005c9e29c686ce76883f0d209057e654ff3 /actions/all.php | |
| parent | 986a32223177a759b0ef071822d227011ee1b3c7 (diff) | |
| parent | 3383e780635a29d3457a7d983a137b86c63b27ef (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'actions/all.php')
| -rw-r--r-- | actions/all.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/all.php b/actions/all.php index 08dcccbdd..8e67ec0f3 100644 --- a/actions/all.php +++ b/actions/all.php @@ -77,12 +77,12 @@ class AllAction extends Action 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', + 'method' => 'friends_timeline', 'argument' => $this->user->nickname.'.rss')), 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', + 'method' => 'friends_timeline', 'argument' => $this->user->nickname.'.atom')), sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname))); } |