summaryrefslogtreecommitdiff
path: root/lib/router.php
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-11-20 11:12:17 +0000
committerZach Copley <zach@status.net>2009-11-20 11:12:17 +0000
commitc0283802f53bb5243bb3dacac3f0ced20f8c0ff0 (patch)
tree9713ac6f46e68828ed043cfec907f8a74d648e1b /lib/router.php
parente640561ccdcd4f3472302341ed15503e1c9d8319 (diff)
parent224d82793c769c06d1e4f39c19cd5f2e9cf519b0 (diff)
Merge branch 'master' of git@gitorious.org:statusnet/mainline
Diffstat (limited to 'lib/router.php')
-rw-r--r--lib/router.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/router.php b/lib/router.php
index b22185126..beb98eb04 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -88,8 +88,6 @@ 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',