Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php
index baaea6fd9bd41b25de22a6b762b1f996879ebb02..8f0329cb80949fb97936a19139537b7e059ab6da 100644 (file)
--- a/actions/apioauthauthorize.php
+++ b/actions/apioauthauthorize.php
@@ -60,7 +60,7 @@ class ApiOAuthAuthorizeAction extends ApiOAuthAction
         return false;
     }
 
-    function prepare($args)
+    function prepare(array $args = array())
     {
         parent::prepare($args);
 
@@ -68,7 +68,7 @@ class ApiOAuthAuthorizeAction extends ApiOAuthAction
         $this->password        = $this->arg('password');
         $this->oauthTokenParam = $this->arg('oauth_token');
         $this->mode            = $this->arg('mode');
-        $this->store           = new ApiGNUSocialOAuthDataStore();
+        $this->store           = new ApiGNUsocialOAuthDataStore();
 
         try {
             $this->app = $this->store->getAppByRequestToken($this->oauthTokenParam);
@@ -88,9 +88,9 @@ class ApiOAuthAuthorizeAction extends ApiOAuthAction
      *
      * @return void
      */
-    function handle($args)
+    function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {