Merge remote-tracking branch 'upstream/master'

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

diff --git a/actions/apiaccountratelimitstatus.php b/actions/apiaccountratelimitstatus.php
index ee3fdd86ace529c77c3d205df99ec9614ccfaa8e..167a2dd6f55b9c7b0957f169ac27b24aeedfb8a1 100644 (file)
--- a/actions/apiaccountratelimitstatus.php
+++ b/actions/apiaccountratelimitstatus.php
@@ -31,9 +31,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * We don't have a rate limit, but some clients check this method.
@@ -58,9 +56,9 @@ class ApiAccountRateLimitStatusAction extends ApiBareAuthAction
      *
      * @return void
      */
-    function handle(array $args=array())
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         if (!in_array($this->format, array('xml', 'json'))) {
             $this->clientError(
@@ -69,7 +67,6 @@ class ApiAccountRateLimitStatusAction extends ApiBareAuthAction
                 404,
                 $this->format
             );
-            return;
         }
 
         $reset   = new DateTime();