diff options
author | Brett Profitt <brett.profitt@gmail.com> | 2011-10-29 15:10:48 -0700 |
---|---|---|
committer | Brett Profitt <brett.profitt@gmail.com> | 2011-10-29 15:10:48 -0700 |
commit | 6971caddb2245bec34fd23927f6f093e5b28c1ea (patch) | |
tree | a8c78a2b8f79201e04696687ad095e81eeee1805 /mod/oauth_api/vendors/oauth/library/OAuthServer.php | |
parent | 3e4641537ff66b7e634f83e7a3386df9273ec9ff (diff) | |
parent | 9046723db0c21cd0995ec87e69734bd1f0edcae6 (diff) | |
download | elgg-6971caddb2245bec34fd23927f6f093e5b28c1ea.tar.gz elgg-6971caddb2245bec34fd23927f6f093e5b28c1ea.tar.bz2 |
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'mod/oauth_api/vendors/oauth/library/OAuthServer.php')
-rw-r--r-- | mod/oauth_api/vendors/oauth/library/OAuthServer.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/oauth_api/vendors/oauth/library/OAuthServer.php b/mod/oauth_api/vendors/oauth/library/OAuthServer.php index d86cc5f14..c7f9097b3 100644 --- a/mod/oauth_api/vendors/oauth/library/OAuthServer.php +++ b/mod/oauth_api/vendors/oauth/library/OAuthServer.php @@ -58,7 +58,7 @@ class OAuthServer extends OAuthRequestVerifier } // Create a request token - $store = elggconnect_get_oauth_store();//OAuthStore::instance(); + $store = OAuthStore::instance(); $token = $store->addConsumerRequestToken($this->getParam('oauth_consumer_key', true), $options); $result = 'oauth_token='.$this->urlencode($token['token']) .'&oauth_token_secret='.$this->urlencode($token['token_secret']); @@ -104,7 +104,7 @@ class OAuthServer extends OAuthRequestVerifier { OAuthRequestLogger::start($this); - $store = elggconnect_get_oauth_store();//OAuthStore::instance(); + $store = OAuthStore::instance(); $token = $this->getParam('oauth_token', true); $rs = $store->getConsumerRequestToken($token); if (empty($rs)) @@ -142,7 +142,7 @@ class OAuthServer extends OAuthRequestVerifier && $_SESSION['verify_oauth_token'] == $token) { // Flag the token as authorized, or remove the token when not authorized - $store = elggconnect_get_oauth_store();//OAuthStore::instance(); + $store = OAuthStore::instance(); // Fetch the referrer host from the oauth callback parameter $referrer_host = ''; @@ -198,7 +198,7 @@ class OAuthServer extends OAuthRequestVerifier $options['token_ttl'] = $ttl; } - $store = elggconnect_get_oauth_store();//OAuthStore::instance(); + $store = OAuthStore::instance(); $token = $store->exchangeConsumerRequestForAccessToken($this->getParam('oauth_token', true), $options); $result = 'oauth_token='.$this->urlencode($token['token']) .'&oauth_token_secret='.$this->urlencode($token['token_secret']); |