summaryrefslogtreecommitdiff
path: root/lib/router.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-12-08 14:43:21 -0500
committerEvan Prodromou <evan@status.net>2009-12-08 14:43:21 -0500
commit78fc9483d4d1fde4561905edf6594b86c4dc374e (patch)
tree7172cabba4c36bb3a7bd00a78ab09f1791a9a60c /lib/router.php
parent75b11527c7efb1d3d9c7d53b99d80480ce06a9f5 (diff)
parent3536f01258dc43bee764c98fbdda5a6f1df7bcb2 (diff)
Merge branch '0.9.x' into testing
Diffstat (limited to 'lib/router.php')
-rw-r--r--lib/router.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/router.php b/lib/router.php
index 1a090861e..37525319f 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -88,6 +88,8 @@ 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'=>'.+'));
+
// main stuff is repetitive
$main = array('login', 'logout', 'register', 'subscribe',