Merge remote-tracking branch 'upstream/master'

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

diff --git a/actions/apioauthrequesttoken.php b/actions/apioauthrequesttoken.php
index b9346a9e87d5f08e671506b4099c9bbfa6aa6204..4f5a469caa9dbb1a5bb3db1ad83bb01052578577 100644 (file)
--- a/actions/apioauthrequesttoken.php
+++ b/actions/apioauthrequesttoken.php
@@ -49,7 +49,7 @@ class ApiOAuthRequestTokenAction extends ApiOAuthAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -69,11 +69,11 @@ class ApiOAuthRequestTokenAction extends ApiOAuthAction
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
-        $datastore   = new ApiGNUSocialOAuthDataStore();
+        $datastore   = new ApiGNUsocialOAuthDataStore();
         $server      = new OAuthServer($datastore);
         $hmac_method = new OAuthSignatureMethod_HMAC_SHA1();
 
@@ -146,7 +146,7 @@ class ApiOAuthRequestTokenAction extends ApiOAuthAction
 
             return true;
         } else {
-            return Validate::uri($callback);
+            return filter_var($callback, FILTER_VALIDATE_URL);
         }
     }
 }