Merge branch 'master' into nightly

[quix0rs-gnu-social.git] / plugins / TwitterBridge / lib / twitteroauthclient.php

diff --git a/plugins/TwitterBridge/lib/twitteroauthclient.php b/plugins/TwitterBridge/lib/twitteroauthclient.php
index f992a09079299d6bba4691d575445a99f389123f..93d10b8d48ed20be6182c0ca015e6c73578c183c 100644 (file)
--- a/plugins/TwitterBridge/lib/twitteroauthclient.php
+++ b/plugins/TwitterBridge/lib/twitteroauthclient.php
@@ -111,7 +111,7 @@ class TwitterOAuthClient extends OAuthClient
      *
      * @return OAuthToken $token the request token
      */
-    function getRequestToken()
+    function getTwitterRequestToken()
     {
         return parent::getRequestToken(
             self::$requestTokenURL,
@@ -126,7 +126,7 @@ class TwitterOAuthClient extends OAuthClient
      *
      * @return the link
      */
-    function getAuthorizeLink($request_token, $signin = false)
+    function getTwitterAuthorizeLink($request_token, $signin = false)
     {
         $url = ($signin) ? self::$signinUrl : self::$authorizeURL;
 
@@ -142,7 +142,7 @@ class TwitterOAuthClient extends OAuthClient
      *
      * @return OAuthToken $token the access token
      */
-    function getAccessToken($verifier = null)
+    function getTwitterAccessToken($verifier = null)
     {
         return parent::getAccessToken(
             self::$accessTokenURL,