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

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

diff --git a/actions/apitrends.php b/actions/apitrends.php
index 5b74636c697c4460ba893403c498972f7f6dda64..6e6810b95d2ffad61f2cefcd0c02afa8d673d1d3 100644 (file)
--- a/actions/apitrends.php
+++ b/actions/apitrends.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apiprivateauth.php';
-
 /**
  *  Returns the top ten queries that are currently trending
  *
@@ -44,10 +42,8 @@ require_once INSTALLDIR.'/lib/apiprivateauth.php';
  *
  * @see      ApiAction
  */
-
 class ApiTrendsAction extends ApiPrivateAuthAction
 {
-
     var $callback;
 
     /**
@@ -57,7 +53,7 @@ class ApiTrendsAction extends ApiPrivateAuthAction
      *
      * @return boolean false if user doesn't exist
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
         return true;
@@ -70,8 +66,7 @@ class ApiTrendsAction extends ApiPrivateAuthAction
      *
      * @return void
      */
-
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
         $this->showTrends();
@@ -84,7 +79,7 @@ class ApiTrendsAction extends ApiPrivateAuthAction
      */
     function showTrends()
     {
+        // TRANS: Server error for unfinished API method showTrends.
         $this->serverError(_('API method under construction.'), 501);
     }
-
-}
\ No newline at end of file
+}