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

diff --git a/actions/userrss.php b/actions/userrss.php
index e03eb93566d3c96dae04c8e6526a2f5835362996..8f597e625903558468a9e324e04fc8b71a9eb718 100644 (file)
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -72,7 +72,7 @@ class UserrssAction extends Rss10Action
     {
         $notice = $this->user->getNotices(
             0,
-            ($limit == 0) ? NOTICES_PER_PAGE : $limit
+            ($this->limit == 0) ? NOTICES_PER_PAGE : $this->limit
         );
 
         $notices = array();