Merge branch '0.7.x' into 0.8.x

[quix0rs-gnu-social.git] / actions / grouprss.php

diff --git a/actions/grouprss.php b/actions/grouprss.php
index 1a7b858b1ee0da247f620252597d2abb1a67ae81..a9a2eef877c442396424ada89c55eab7289e27b8 100644 (file)
--- a/actions/grouprss.php
+++ b/actions/grouprss.php
@@ -57,7 +57,7 @@ class groupRssAction extends Rss10Action
      * @return boolean true
      */
 
-    function isReadOnly()
+    function isReadOnly($args)
     {
         return true;
     }
@@ -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);
-    }
 }