Merge branch '0.7.x' into 0.8.x

2009-04-03 21:47:39 +00:00
parent 798984381f 123f6d7d0c
commit e632f3be6f
9 changed files with 100 additions and 37 deletions
--- a/lib/router.php
+++ b/lib/router.php
@@ -107,6 +107,9 @@ class Router
            $m->connect('main/'.$a, array('action' => $a));
        }

+        $m->connect('main/sup/:seconds', array('action' => 'sup'),
+                    array('seconds' => '[0-9]+'));
+
        $m->connect('main/tagother/:id', array('action' => 'tagother'));

        // these take a code