Merge branch '0.9.x' into pluginize-twitter-bridge

[quix0rs-gnu-social.git] / lib / router.php

diff --git a/lib/router.php b/lib/router.php
index 8f13b8852009997165c076c3ba22f4bee1a05e47..f122c2b6475290fdae4c3ca1a1db3bc30eacfe70 100644 (file)
--- 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'));
         }