diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-19 14:42:19 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-19 14:42:19 -0400 |
commit | 8cc8f9fd0c0ad8d1c38bd0c113f9f0a4d7918256 (patch) | |
tree | 9ff8e6cecfcd1539a2d6772133cd99e7706d94fc /lib/rssaction.php | |
parent | 99f8501d321ae9d8087abbe6523e28ce5fd095d3 (diff) | |
parent | 09e95cc33fb2228066d524e399bcc549e85eb565 (diff) |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Conflicts:
config.php.sample
Diffstat (limited to 'lib/rssaction.php')
-rw-r--r-- | lib/rssaction.php | 6 |
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(); } |