diff options
| author | Federico Marani <federico.marani@ymail.com> | 2009-03-16 22:43:51 +0000 |
|---|---|---|
| committer | Federico Marani <federico.marani@ymail.com> | 2009-03-16 22:43:51 +0000 |
| commit | 420c3613049bec1360cdeb1f50283b239adf23d3 (patch) | |
| tree | 0ab458b3c45c883232b3ed31addbc2aba1288f6a /actions/all.php | |
| parent | bab3e1b8586f42bc1f0a5f96b6990d67c6b74446 (diff) | |
| parent | b3a0eea3b66e95becb6c4595ed71c7fe71ed6437 (diff) | |
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.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))); } |