Merge branch '0.9.x' into 1.0.x

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

diff --git a/actions/apioauthrequesttoken.php b/actions/apioauthrequesttoken.php
index 478d2dbfc433c4e152b9f0f6626c5dabcd0b384e..3765671256fed83af6e0ac8a054bd9a62d616038 100644 (file)
--- 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);
         }
     }