summaryrefslogtreecommitdiff
path: root/actions/apioauthrequesttoken.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-10-22 09:24:49 -0400
committerEvan Prodromou <evan@status.net>2010-10-22 09:24:49 -0400
commite1e79e62360191626fbb3eae9f5d2af249780ac9 (patch)
treeb9b56dd72d03bcbb71120cc81ac04f002acb531f /actions/apioauthrequesttoken.php
parent13571b32eaa60f09f906296fec1d5d63749eb132 (diff)
parentd6f4588b9ede2cb26b06084b3117ec9184f9e64e (diff)
Merge remote branch 'gitorious/0.9.x' into 0.9.x
Diffstat (limited to 'actions/apioauthrequesttoken.php')
-rw-r--r--actions/apioauthrequesttoken.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/actions/apioauthrequesttoken.php b/actions/apioauthrequesttoken.php
index 478d2dbfc..376567125 100644
--- a/actions/apioauthrequesttoken.php
+++ b/actions/apioauthrequesttoken.php
@@ -146,7 +146,7 @@ class ApiOauthRequestTokenAction extends ApiOauthAction
function verifyCallback($callback)
{
if ($callback == "oob") {
- common_debug("OAuth request token requested for out of bounds client.");
+ common_debug("OAuth request token requested for out of band client.");
// XXX: Should we throw an error if a client is registered as a
// web application but requests the pin based workflow? For now I'm
@@ -154,10 +154,7 @@ class ApiOauthRequestTokenAction extends ApiOauthAction
return true;
} else {
- return Validate::uri(
- $callback,
- array('allowed_schemes' => array('http', 'https'))
- );
+ return Validate::uri($callback);
}
}