Merge branch '0.9.x' into 1.0.x

2010-10-12 16:33:36 -07:00
parent aa02f6020e 112b6c4079
commit 5f81f6119b
269 changed files with 7703 additions and 3045 deletions
--- a/lib/router.php
+++ b/lib/router.php
@@ -278,7 +278,7 @@ class Router

            $m->connect('group/new', array('action' => 'newgroup'));

-            foreach (array('edit', 'join', 'leave') as $v) {
+            foreach (array('edit', 'join', 'leave', 'delete') as $v) {
                $m->connect('group/:nickname/'.$v,
                            array('action' => $v.'group'),
                            array('nickname' => '[a-zA-Z0-9]+'));