diff options
author | Brion Vibber <brion@pobox.com> | 2010-06-16 12:37:14 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-06-16 12:37:14 -0700 |
commit | d65d9826811c5e9b2aec01aa89abffbfbee535f8 (patch) | |
tree | 2ea6a438928375bbad115d9741cabcedae872be1 /lib | |
parent | a1b25b46bc4bf3dbe7766e865e0a47056786bf0c (diff) | |
parent | ce7176d9878e298cd1ed5bc44e97aca5a4a6bc81 (diff) |
Merge branch 'master' into testing
Diffstat (limited to 'lib')
-rw-r--r-- | lib/router.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/router.php b/lib/router.php index f2b2b845f..fec229c9b 100644 --- a/lib/router.php +++ b/lib/router.php @@ -263,7 +263,7 @@ class Router $m->connect('tag', array('action' => 'publictagcloud')); $m->connect('tag/:tag/rss', array('action' => 'tagrss'), - array('tag' => '[a-zA-Z0-9]+')); + array('tag' => '[\pL\pN_\-\.]{1,64}')); $m->connect('tag/:tag', array('action' => 'tag'), array('tag' => '[\pL\pN_\-\.]{1,64}')); @@ -749,12 +749,12 @@ class Router $m->connect('tag/:tag/rss', array('action' => 'userrss', 'nickname' => $nickname), - array('tag' => '[a-zA-Z0-9]+')); + array('tag' => '[\pL\pN_\-\.]{1,64}')); $m->connect('tag/:tag', array('action' => 'showstream', 'nickname' => $nickname), - array('tag' => '[a-zA-Z0-9]+')); + array('tag' => '[\pL\pN_\-\.]{1,64}')); $m->connect('rsd.xml', array('action' => 'rsd', @@ -815,12 +815,12 @@ class Router $m->connect(':nickname/tag/:tag/rss', array('action' => 'userrss'), array('nickname' => '[a-zA-Z0-9]{1,64}'), - array('tag' => '[a-zA-Z0-9]+')); + array('tag' => '[\pL\pN_\-\.]{1,64}')); $m->connect(':nickname/tag/:tag', array('action' => 'showstream'), array('nickname' => '[a-zA-Z0-9]{1,64}'), - array('tag' => '[a-zA-Z0-9]+')); + array('tag' => '[\pL\pN_\-\.]{1,64}')); $m->connect(':nickname/rsd.xml', array('action' => 'rsd'), |