Merge branch 'master' into 1.0.x

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

diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php
index 064d05120f6093e576db39834a78999c8ba9ae2e..76b06c28a22cc7cb8e9a124127f3ec474a0a6917 100644 (file)
--- a/actions/apioauthaccesstoken.php
+++ b/actions/apioauthaccesstoken.php
@@ -84,6 +84,7 @@ class ApiOauthAccessTokenAction extends ApiOauthAction
             common_debug(var_export($req, true));
             $code = $e->getCode();
             $this->clientError($e->getMessage(), empty($code) ? 401 : $code, 'text');
+            return;
         }
 
         if (empty($atok)) {
@@ -98,7 +99,7 @@ class ApiOauthAccessTokenAction extends ApiOauthAction
 
             common_log(LOG_WARNING, $msg);
             // TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-            $this->clientError(_("Invalid request token or verifier.", 400, 'text'));
+            $this->clientError(_('Invalid request token or verifier.'), 400, 'text');
         } else {
             common_log(
                 LOG_INFO,