From: Brion Vibber <brion@pobox.com>
Date: Fri, 9 Apr 2010 22:20:14 +0000 (-0700)
Subject: Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7303acf7adbfd57aabcad095154ee48968e75e3b;hp=47eed2c99906fefb1f43ad186da91e526d2741cf;p=quix0rs-gnu-social.git

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 e03eb93566..8f597e6259 100644
--- 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();