diff options
author | Evan Prodromou <evan@status.net> | 2010-01-27 22:05:32 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-01-27 22:05:32 -0500 |
commit | 5e1a9ad04d4e10ee44881a26ea72c9a80f748188 (patch) | |
tree | 78b7f4287d00a2ff32cf6adf82c6289a5d3b6b95 /plugins/TwitterBridge/twitteroauthclient.php | |
parent | 817f01c3b18ec626701de2a1402562eeb87eee6d (diff) | |
parent | ee4ea3f3e1eb64df2dd3ba677f5201f8787482a8 (diff) |
Merge branch 'testing'
Conflicts:
theme/base/css/display.css
Diffstat (limited to 'plugins/TwitterBridge/twitteroauthclient.php')
-rw-r--r-- | plugins/TwitterBridge/twitteroauthclient.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/TwitterBridge/twitteroauthclient.php b/plugins/TwitterBridge/twitteroauthclient.php index bad2b74ca..277e7ab40 100644 --- a/plugins/TwitterBridge/twitteroauthclient.php +++ b/plugins/TwitterBridge/twitteroauthclient.php @@ -45,6 +45,7 @@ class TwitterOAuthClient extends OAuthClient { public static $requestTokenURL = 'https://twitter.com/oauth/request_token'; public static $authorizeURL = 'https://twitter.com/oauth/authorize'; + public static $signinUrl = 'https://twitter.com/oauth/authenticate'; public static $accessTokenURL = 'https://twitter.com/oauth/access_token'; /** @@ -97,9 +98,11 @@ class TwitterOAuthClient extends OAuthClient * * @return the link */ - function getAuthorizeLink($request_token) + function getAuthorizeLink($request_token, $signin = false) { - return parent::getAuthorizeLink(self::$authorizeURL, + $url = ($signin) ? self::$signinUrl : self::$authorizeURL; + + return parent::getAuthorizeLink($url, $request_token, common_local_url('twitterauthorization')); } |