Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

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

diff --git a/actions/userrss.php b/actions/userrss.php
index a3e5a3aab710a05699ef64eeffb5c6084397d35a..5861d9ee3687bd7a4e79e6088ea30a059c690a2b 100644 (file)
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -53,6 +53,7 @@ class UserrssAction extends Rss10Action
 
         $notice = $user->getNotices(0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
 
+        $notices = array();
         while ($notice->fetch()) {
             $notices[] = clone($notice);
         }
@@ -95,7 +96,7 @@ class UserrssAction extends Rss10Action
         parent::initRss($limit);
     }
 
-    function isReadOnly()
+    function isReadOnly($args)
     {
         return true;
     }