Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

1 files changed, 2 insertions, 2 deletions

diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php
index 30fe77ec8..0b6cf34bd 100644
--- a/actions/apioauthauthorize.php
+++ b/actions/apioauthauthorize.php
@@ -560,7 +560,7 @@ class ApiOauthAuthorizeAction extends Action
                 // TRANS: User notification after revoking OAuth access to an application.
                 // TRANS: %s is an OAuth token.
                 _('The request token %s has been revoked.'),
-                $this->oauthTokenParm
+                $this->oauthTokenParam
             )
         );
 
@@ -618,7 +618,7 @@ class ApiOauthAuthorizeAction extends Action
         $callback = null;
 
         // Return the verified callback if we have one
-        if ($this->app->type == 2) {
+        if ($this->reqToken->verified_callback != 'oob') {
 
             $callback = $this->reqToken->verified_callback;