Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

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

diff --git a/actions/userrss.php b/actions/userrss.php
index fa6d588cdf4358f7c2f99f37853bb10b7e3de8b7..19e610551d4bca2ec9cf65defde29b7e003a76de 100644 (file)
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -25,7 +25,6 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 class UserrssAction extends Rss10Action
 {
-    var $user = null;
     var $tag  = null;
 
     function prepare($args)
@@ -39,6 +38,7 @@ class UserrssAction extends Rss10Action
             $this->clientError(_('No such user.'));
             return false;
         } else {
+            $this->notices = $this->getNotices($this->limit);
             return true;
         }
     }
@@ -64,9 +64,8 @@ class UserrssAction extends Rss10Action
 
     function getNotices($limit=0)
     {
-
         $user = $this->user;
-
+        
         if (is_null($user)) {
             return null;
         }