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/showgroup.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/showgroup.php')
-rw-r--r-- | actions/showgroup.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/actions/showgroup.php b/actions/showgroup.php index bfe45ddad..a4af29391 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -328,17 +328,15 @@ class ShowgroupAction extends GroupDesignAction sprintf(_('Notice feed for %s group (RSS 1.0)'), $this->group->nickname)), new Feed(Feed::RSS2, - common_local_url('api', - array('apiaction' => 'groups', - 'method' => 'timeline', - 'argument' => $this->group->nickname.'.rss')), + common_local_url('ApiTimelineGroup', + array('format' => 'rss', + 'id' => $this->group->nickname)), sprintf(_('Notice feed for %s group (RSS 2.0)'), $this->group->nickname)), new Feed(Feed::ATOM, - common_local_url('api', - array('apiaction' => 'groups', - 'method' => 'timeline', - 'argument' => $this->group->nickname.'.atom')), + common_local_url('ApiTimelineGroup', + array('format' => 'atom', + 'id' => $this->group->nickname)), sprintf(_('Notice feed for %s group (Atom)'), $this->group->nickname)), new Feed(Feed::FOAF, |