Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

2010-02-25 18:45:32 -05:00
parent 6578e0e1af e254c660f6
commit 4aa82f75ed
14 changed files with 295 additions and 93 deletions
--- 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) {