Merge pull request #5830 from nupplaphil/update_from_boot

[friendica.git] / mod / api.php

diff --git a/mod/api.php b/mod/api.php
index e9e913012dbc1f73f5b5237aad150b049557e266..716b484461aeff250e902a856a040da6e1ddbec7 100644 (file)
--- a/mod/api.php
+++ b/mod/api.php
@@ -5,7 +5,8 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Module\Login;
 
 require_once 'include/api.php';
@@ -20,9 +21,9 @@ function oauth_get_client($request)
        $r = q("SELECT `clients`.*
                        FROM `clients`, `tokens`
                        WHERE `clients`.`client_id`=`tokens`.`client_id`
-                       AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'", dbesc($token));
+                       AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'", DBA::escape($token));
 
-       if (!DBM::is_result($r)) {
+       if (!DBA::isResult($r)) {
                return null;
        }
 
@@ -76,7 +77,7 @@ function api_content(App $a)
                                if (strstr($consumer->callback_url, $glue)) {
                                        $glue = "?";
                                }
-                               goaway($consumer->callback_url . $glue . "oauth_token=" . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . OAuthUtil::urlencode_rfc3986($verifier));
+                               $a->internalRedirect($consumer->callback_url . $glue . 'oauth_token=' . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . '&oauth_verifier=' . OAuthUtil::urlencode_rfc3986($verifier));
                                killme();
                        }