Merge branch 'twitter-oauth' into 0.8.x

Conflicts: scripts/getvaliddaemons.php
2009-08-10 07:49:51 +00:00
parent c1b19929f6 06c5f490ea
commit 17dcf1c317
14 changed files with 1384 additions and 893 deletions
--- a/lib/router.php
+++ b/lib/router.php
@@ -88,6 +88,10 @@ class Router

        $m->connect('doc/:title', array('action' => 'doc'));

+        // Twitter
+
+        $m->connect('twitter/authorization', array('action' => 'twitterauthorization'));
+
        // facebook

        $m->connect('facebook', array('action' => 'facebookhome'));