diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-11 00:45:26 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-11 00:45:26 -0800 |
| commit | 8809e577b2c8cf1b8b187840aaf9674136929ec7 (patch) | |
| tree | 28ed1e16f26d55510402f928ed9e484f0670cf01 /lib/router.php | |
| parent | ad63a9518cb77d548e61fb39d05f8066733c326d (diff) | |
| parent | 92deb35bc4dbd4203bce93bffec4cfb58eab032c (diff) | |
Merge branch 'sessionidparam' into 0.9.x
Conflicts:
lib/command.php
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/router.php b/lib/router.php index 785e78fd0..6b87ed27f 100644 --- a/lib/router.php +++ b/lib/router.php @@ -88,7 +88,10 @@ class Router $m->connect('doc/:title', array('action' => 'doc')); - $m->connect('main/login?user_id=:user_id&token=:token', array('action'=>'login'), array('user_id'=> '[0-9]+', 'token'=>'.+')); + $m->connect('main/otp/:user_id/:token', + array('action' => 'otp'), + array('user_id' => '[0-9]+', + 'token' => '.+')); // main stuff is repetitive |