diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-26 09:35:28 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-26 09:35:28 -0800 |
| commit | 8dfc8f1635940b096e7f4025e3aef0ca4f909eb2 (patch) | |
| tree | 9fce4aa765d56496031698f219da2f0f82b33e80 /lib/router.php | |
| parent | 8914b69d5055c1bc7d0604ee338ffdaf6b0a8606 (diff) | |
| parent | b331e971b055386a126aaec27d661f26ba3b813c (diff) | |
Merge branch 'testing' into 0.9.x
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/router.php b/lib/router.php index 987d0152e..abbce041d 100644 --- a/lib/router.php +++ b/lib/router.php @@ -247,6 +247,9 @@ class Router $m->connect('group/:nickname/'.$v, array('action' => $v.'group'), array('nickname' => '[a-zA-Z0-9]+')); + $m->connect('group/:id/id/'.$v, + array('action' => $v.'group'), + array('id' => '[0-9]+')); } foreach (array('members', 'logo', 'rss', 'designsettings') as $n) { @@ -668,7 +671,7 @@ class Router foreach (array('subscriptions', 'subscribers', 'all', 'foaf', 'xrds', - 'replies', 'microsummary') as $a) { + 'replies', 'microsummary', 'hcard') as $a) { $m->connect($a, array('action' => $a, 'nickname' => $nickname)); @@ -734,7 +737,7 @@ class Router foreach (array('subscriptions', 'subscribers', 'nudge', 'all', 'foaf', 'xrds', - 'replies', 'inbox', 'outbox', 'microsummary') as $a) { + 'replies', 'inbox', 'outbox', 'microsummary', 'hcard') as $a) { $m->connect(':nickname/'.$a, array('action' => $a), array('nickname' => '[a-zA-Z0-9]{1,64}')); |