summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2010-04-10 00:59:21 +0200
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2010-04-10 00:59:21 +0200
commit8dda28d3749535fc07c56df67167fc23be860ed7 (patch)
tree16c7de5f92ff62979d88f5c82c045269376a5171 /actions
parent3656a2cb13c0b6ba2326d6209739c1cd762ee2d2 (diff)
parent7303acf7adbfd57aabcad095154ee48968e75e3b (diff)
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Diffstat (limited to 'actions')
-rw-r--r--actions/userrss.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/userrss.php b/actions/userrss.php
index cf7d18ca8..c6103b2f8 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();