Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/apisearchjson.php b/actions/apisearchjson.php
index cec826c0164b3913ee83a674eb3f30dc67ac8b10..d49444369d8a0f2f02944519b7ebde5e3e4d0e2f 100644 (file)
--- a/actions/apisearchjson.php
+++ b/actions/apisearchjson.php
@@ -57,7 +57,7 @@ class ApiSearchJSONAction extends ApiPrivateAuthAction
      *
      * @return boolean true if nothing goes wrong
      */
-    function prepare($args)
+    function prepare(array $args = array())
     {
         parent::prepare($args);