summaryrefslogtreecommitdiff
path: root/actions/grouprss.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-02-22 17:03:41 -0800
committerZach Copley <zach@controlyourself.ca>2009-02-22 17:03:41 -0800
commit8e0508dad3bb888b0c01834614b1aa7e16cfe583 (patch)
tree04f2734597377942fbbfc5b4f133e951ccc645a5 /actions/grouprss.php
parentcdab8d55a96b61ce6cfbec697d95e3223751fd3f (diff)
parentda532bae9131b6dec8f5c0d67ce77c4ad1736f7d (diff)
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'actions/grouprss.php')
-rw-r--r--actions/grouprss.php15
1 files changed, 3 insertions, 12 deletions
diff --git a/actions/grouprss.php b/actions/grouprss.php
index 1a7b858b1..de76a5960 100644
--- a/actions/grouprss.php
+++ b/actions/grouprss.php
@@ -111,13 +111,13 @@ class groupRssAction extends Rss10Action
{
$group = $this->group;
-
+
if (is_null($group)) {
return null;
}
-
+
$notice = $group->getNotices(0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
-
+
while ($notice->fetch()) {
$notices[] = clone($notice);
}
@@ -141,13 +141,4 @@ class groupRssAction extends Rss10Action
{
return $this->group->homepage_logo;
}
-
- # override parent to add X-SUP-ID URL
-
- function initRss($limit=0)
- {
- $url = common_local_url('sup', null, $this->group->id);
- header('X-SUP-ID: '.$url);
- parent::initRss($limit);
- }
}