diff options
author | Craig Andrews <candrews@integralblue.com> | 2010-02-16 10:25:57 -0500 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2010-02-16 10:25:57 -0500 |
commit | 32084e33a266797b306158df29e48f057651b410 (patch) | |
tree | 2a46e529783c8547aaae8ac00c8cac9bdfa61490 /actions/showgroup.php | |
parent | 057ec1fceacbfec1f755a5bc6700a188aa70e33f (diff) | |
parent | d4f6235d7b8a40bd1b51370e7eb405cdb14e61fb (diff) |
Merge branch '0.9.x' into 1.0.x
Conflicts:
lib/queuemanager.php
Diffstat (limited to 'actions/showgroup.php')
-rw-r--r-- | actions/showgroup.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/showgroup.php b/actions/showgroup.php index 8042a4951..eb1238902 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -330,13 +330,13 @@ class ShowgroupAction extends GroupDesignAction new Feed(Feed::RSS2, common_local_url('ApiTimelineGroup', array('format' => 'rss', - 'id' => $this->group->nickname)), + 'id' => $this->group->id)), sprintf(_('Notice feed for %s group (RSS 2.0)'), $this->group->nickname)), new Feed(Feed::ATOM, common_local_url('ApiTimelineGroup', array('format' => 'atom', - 'id' => $this->group->nickname)), + 'id' => $this->group->id)), sprintf(_('Notice feed for %s group (Atom)'), $this->group->nickname)), new Feed(Feed::FOAF, |