summaryrefslogtreecommitdiff
path: root/lib/rssaction.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-05-18 23:28:48 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-05-18 23:28:48 +0000
commit8d68c5238dfed8872e8ef3bf128d018cc974cdab (patch)
tree60434542677d1769ecb0cc657a3ea1a2d9be3e46 /lib/rssaction.php
parent8b5bcae58fba59734a566315f04499fcc1433c75 (diff)
parent9261e48ef039869fb3709d374b7e4346d8773a49 (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();
}