summaryrefslogtreecommitdiff
path: root/actions/tagrss.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2010-03-08 17:22:23 -0500
committerCraig Andrews <candrews@integralblue.com>2010-03-08 17:22:23 -0500
commit714d920faea302b55857cc3bec4e9e6160ea136a (patch)
treecffa5ee7a3261ad24b272cb3ced16a6c1dcafad1 /actions/tagrss.php
parentc187bf55974347f7ddb4f28714af57861dce8f08 (diff)
parent51a245f18c1e4a830c5eb94f3e60c6b4b3e560ee (diff)
Merge branch '0.9.x' into 1.0.x
Conflicts: classes/statusnet.ini db/statusnet.sql lib/jabber.php lib/xmppmanager.php
Diffstat (limited to 'actions/tagrss.php')
-rw-r--r--actions/tagrss.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/actions/tagrss.php b/actions/tagrss.php
index 75cbfa274..467a64abe 100644
--- a/actions/tagrss.php
+++ b/actions/tagrss.php
@@ -35,6 +35,7 @@ class TagrssAction extends Rss10Action
$this->clientError(_('No such tag.'));
return false;
} else {
+ $this->notices = $this->getNotices($this->limit);
return true;
}
}