diff options
author | Evan Prodromou <evan@status.net> | 2009-10-21 22:41:42 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-10-21 22:41:42 -0400 |
commit | 4e639b8769f42e700b9ad3abe5564ddb0178501c (patch) | |
tree | f1ccb3017bf2ba0a79a4562cd36c2b61276a4a07 /lib/router.php | |
parent | 0df85711d6b2b02f8857e9d1b51fda4183be8bf3 (diff) | |
parent | 5e536a66141fac332e77c5ea6e85aee6a9347ace (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/router.php')
-rw-r--r-- | lib/router.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/router.php b/lib/router.php index b9a45d867..a5b6a9a30 100644 --- a/lib/router.php +++ b/lib/router.php @@ -86,10 +86,6 @@ class Router $m->connect('doc/:title', array('action' => 'doc')); - // Twitter - - $m->connect('twitter/authorization', array('action' => 'twitterauthorization')); - // facebook $m->connect('facebook', array('action' => 'facebookhome')); @@ -136,7 +132,7 @@ class Router // settings foreach (array('profile', 'avatar', 'password', 'im', - 'email', 'sms', 'twitter', 'userdesign', 'other') as $s) { + 'email', 'sms', 'userdesign', 'other') as $s) { $m->connect('settings/'.$s, array('action' => $s.'settings')); } |