summaryrefslogtreecommitdiff
path: root/actions/showgroup.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-07-10 16:11:31 -0700
committerZach Copley <zach@controlyourself.ca>2009-07-10 16:11:31 -0700
commit5b3d4f7121cf9999edb6789a9c0214dea193fe51 (patch)
tree78b4422b34fd8abf11155bbf6f616f7effe318f7 /actions/showgroup.php
parent49e4f958eb7ff89bfb237da9bf810a0d668104e0 (diff)
parent08d50655f3a220b1fe970b0917a6ecbcae019b04 (diff)
Merge branch 'candrews-review' into 0.8.x
* candrews-review: added group status api, located at /api/statuses/group_timeline/ID.rss
Diffstat (limited to 'actions/showgroup.php')
-rw-r--r--actions/showgroup.php23
1 files changed, 20 insertions, 3 deletions
diff --git a/actions/showgroup.php b/actions/showgroup.php
index ce11d574e..f803840ff 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -317,8 +317,25 @@ class ShowgroupAction extends GroupDesignAction
common_local_url('grouprss',
array('nickname' => $this->group->nickname));
- return array(new Feed(Feed::RSS1, $url, sprintf(_('Notice feed for %s group'),
- $this->group->nickname)));
+ return array(new Feed(Feed::RSS1,
+ common_local_url('grouprss',
+ array('nickname' => $this->group->nickname)),
+ sprintf(_('Notice feed for %s group (RSS 1.0)'),
+ $this->group->nickname)),
+ new Feed(Feed::RSS2,
+ common_local_url('api',
+ array('apiaction' => 'statuses',
+ 'method' => 'group_timeline',
+ 'argument' => $this->group->nickname.'.rss')),
+ sprintf(_('Notice feed for %s group (RSS 2.0)'),
+ $this->group->nickname)),
+ new Feed(Feed::ATOM,
+ common_local_url('api',
+ array('apiaction' => 'statuses',
+ 'method' => 'group_timeline',
+ 'argument' => $this->group->nickname.'.atom')),
+ sprintf(_('Notice feed for %s group (Atom)'),
+ $this->group->nickname)));
}
/**
@@ -466,4 +483,4 @@ class GroupAdminSection extends ProfileSection
{
return null;
}
-} \ No newline at end of file
+}