summaryrefslogtreecommitdiff
path: root/lib/router.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/router.php
parent8b5bcae58fba59734a566315f04499fcc1433c75 (diff)
parent9261e48ef039869fb3709d374b7e4346d8773a49 (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'lib/router.php')
-rw-r--r--lib/router.php10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/router.php b/lib/router.php
index 635e1d77e..70ee0f3fb 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -426,6 +426,16 @@ 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}'),
+ array('tag' => '[a-zA-Z0-9]+'));
+
$m->connect(':nickname',
array('action' => 'showstream'),
array('nickname' => '[a-zA-Z0-9]{1,64}'));