Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php
index 359939b0cc9b8b78201187c6bc5a3e7482a1193b..12daf3e1e6fe68150ea652154ee420bf32bf0ba8 100644 (file)
--- a/actions/apiaccountverifycredentials.php
+++ b/actions/apiaccountverifycredentials.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Check a user's credentials. Returns an HTTP 200 OK response code and a
  * representation of the requesting user if authentication was successful;
@@ -55,18 +53,15 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction
      *
      * Check whether the credentials are valid and output the result
      *
-     * @param array $args $_REQUEST data (unused)
-     *
      * @return void
      */
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         if (!in_array($this->format, array('xml', 'json'))) {
             // TRANS: Client error displayed when coming across a non-supported API method.
             $this->clientError(_('API method not found.'), $code = 404);
-            return;
         }
 
         $twitter_user = $this->twitterUserArray($this->auth_user->getProfile(), true);
@@ -90,7 +85,7 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction
      *
      * @return boolean true
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }