summaryrefslogtreecommitdiff
path: root/lib/rssaction.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-05-19 01:08:28 +0000
committerZach Copley <zach@controlyourself.ca>2009-05-19 01:08:28 +0000
commit4186dd2691bf4f6d0ddbf74e385dca00018747be (patch)
treea0a60918127e426ddf1d8d3bd4535d486e0b8b51 /lib/rssaction.php
parent35b39342337fed5916e06876c8a37068d2052937 (diff)
parent8c5d1b63df63bdf73ef08f8b8c46699089939fc8 (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'lib/rssaction.php')
-rw-r--r--lib/rssaction.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/rssaction.php b/lib/rssaction.php
index ddba862dc..2f25ed7e4 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -97,7 +97,11 @@ class Rss10Action extends Action
// Parent handling, including cache check
parent::handle($args);
// Get the list of notices
- $this->notices = $this->getNotices($this->limit);
+ if (empty($this->tag)) {
+ $this->notices = $this->getNotices($this->limit);
+ } else {
+ $this->notices = $this->getTaggedNotices($this->tag, $this->limit);
+ }
$this->showRss();
}