diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/router.php | 5 | ||||
| -rw-r--r-- | lib/rssaction.php | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/router.php b/lib/router.php index f07e59373..70ee0f3fb 100644 --- a/lib/router.php +++ b/lib/router.php @@ -426,6 +426,11 @@ class Router array('size' => '(original|96|48|24)', 'nickname' => '[a-zA-Z0-9]{1,64}')); + $m->connect(':nickname/tag/:tag/rss', + array('action' => 'userrss'), + array('nickname' => '[a-zA-Z0-9]{1,64}'), + array('tag' => '[a-zA-Z0-9]+')); + $m->connect(':nickname/tag/:tag', array('action' => 'showstream'), array('nickname' => '[a-zA-Z0-9]{1,64}'), 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(); } |