Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / lib / apioauthaction.php

diff --git a/lib/apioauthaction.php b/lib/apioauthaction.php
index 0a6c934b833614f9244a203d569bf52990b2b7ef..53be050022bf2df3159949da976534e15e84a6ad 100644 (file)
--- a/lib/apioauthaction.php
+++ b/lib/apioauthaction.php
@@ -54,25 +54,10 @@ class ApiOAuthAction extends ApiAction
         return false;
     }
 
-    function prepare(array $args=array())
+    protected function prepare(array $args=array())
     {
-        parent::prepare($args);
-        return true;
-    }
-
-    /**
-     * Handle input, produce output
-     *
-     * Switches on request method; either shows the form or handles its input.
-     *
-     * @param array $args $_REQUEST data
-     *
-     * @return void
-     */
-    function handle(array $args=array())
-    {
-        parent::handle($args);
         self::cleanRequest();
+        return parent::prepare($args);
     }
 
     /*