Merge branch 'social-master' into nightly

[quix0rs-gnu-social.git] / plugins / TwitterBridge / actions / twitterlogin.php

diff --git a/plugins/TwitterBridge/actions/twitterlogin.php b/plugins/TwitterBridge/actions/twitterlogin.php
index 379e136045d21dca566501418c5d57b9460135e0..3b2dc2103968ab599ca5fe94b185adfe85bc8ead 100644 (file)
--- a/plugins/TwitterBridge/actions/twitterlogin.php
+++ b/plugins/TwitterBridge/actions/twitterlogin.php
@@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
+require_once dirname(__DIR__) . '/twitter.php';
 
 /**
  * Page for logging in with Twitter
@@ -48,7 +48,7 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
  */
 class TwitterloginAction extends Action
 {
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);