summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-10-21 18:16:35 -0700
committerZach Copley <zach@status.net>2010-10-21 18:16:35 -0700
commitc5a84ef76fa43f3ece5c78d9daf017d20ee26081 (patch)
tree719edfaafcb78c956e70536771126e4de27e8655 /actions
parent0b134d3e6904b67b6e8e8d424a26e2a4f2f37dd6 (diff)
parentaa6ec40c51bc25711cf9b202c7ed5fa2f06f8db4 (diff)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions')
-rw-r--r--actions/apioauthauthorize.php4
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;