Merge branch '0.8.x' into stats

[quix0rs-gnu-social.git] / lib / rssaction.php

diff --git a/lib/rssaction.php b/lib/rssaction.php
index ddba862dcf9b22113d74787215f3a15f094e6b5a..2f25ed7e47d14150094efaa57b5322d1c56b862b 100644 (file)
--- 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();
     }