summaryrefslogtreecommitdiff
path: root/actions/showgroup.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-11-01 13:04:23 -0500
committerEvan Prodromou <evan@status.net>2009-11-01 13:04:23 -0500
commit5f5413624d166a9b2116d266c7698dd6dcd2d8c4 (patch)
tree3f7f85bbfb747d68bf518df026eea6ac686ad0c0 /actions/showgroup.php
parent658683e240ef6e44c6450a16448fe7cb82f792f2 (diff)
parent44ce8e2fcd1eba0d0f2723c246c1a021614e2763 (diff)
Merge branch '0.9.x' into userflag
Diffstat (limited to 'actions/showgroup.php')
-rw-r--r--actions/showgroup.php14
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,