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

This commit is contained in:
Siebrand Mazeland
2010-04-10 00:59:21 +02:00

View File

@@ -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();