Merge branch 'master' into FeedPoller

[quix0rs-gnu-social.git] / actions / oauthconnectionssettings.php

diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php
index 5c667309317c17e9c6a7a8e836ae6e5093e69ab7..eaa0fae8daa740ad1bb3eb284ab884934ca65610 100644 (file)
--- a/actions/oauthconnectionssettings.php
+++ b/actions/oauthconnectionssettings.php
@@ -32,7 +32,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 }
 
 require_once INSTALLDIR . '/lib/applicationlist.php';
-require_once INSTALLDIR . '/lib/apioauthstore.php';
 
 /**
  * Show connected OAuth applications
@@ -167,9 +166,9 @@ class OauthconnectionssettingsAction extends SettingsAction
             return false;
         }
 
-        $app = Oauth_application::staticGet('id', $appUser->application_id);
+        $app = Oauth_application::getKV('id', $appUser->application_id);
 
-        $datastore = new ApiStatusNetOAuthDataStore();
+        $datastore = new ApiGNUsocialOAuthDataStore();
         $datastore->revoke_token($appUser->token, 1);
 
         $result = $appUser->delete();