diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-11 16:28:27 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-11 16:28:27 -0800 |
| commit | ecb3abf84c8b6e868a523b8e721484cb7a4e0f63 (patch) | |
| tree | c27d9b8c427e0e64b0cabe9419c640ac8b382c3b /lib/router.php | |
| parent | a180658a3bfcf2b7b312058e3aa76e0e2467c2f8 (diff) | |
| parent | 7e5c15fa80e23d1fb22744553156bcebad716ae8 (diff) | |
Merge branch '0.9.x' into inblob
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/router.php b/lib/router.php index 287d3c79f..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 @@ -442,19 +445,19 @@ class Router // Social graph $m->connect('api/friends/ids/:id.:format', - array('action' => 'apiFriends', + array('action' => 'apiuserfriends', 'ids_only' => true)); $m->connect('api/followers/ids/:id.:format', - array('action' => 'apiFollowers', + array('action' => 'apiuserfollowers', 'ids_only' => true)); $m->connect('api/friends/ids.:format', - array('action' => 'apiFriends', + array('action' => 'apiuserfriends', 'ids_only' => true)); $m->connect('api/followers/ids.:format', - array('action' => 'apiFollowers', + array('action' => 'apiuserfollowers', 'ids_only' => true)); // account |