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

[quix0rs-gnu-social.git] / plugins / SearchSub / actions / searchsub.php

diff --git a/plugins/SearchSub/actions/searchsub.php b/plugins/SearchSub/actions/searchsub.php
index cf9e5e5e949f3de1c4f2ee8ca499e6f026e4c5da..de43da3aa7583a2a28ddfebfcc89b25ef820c8a6 100644 (file)
--- a/plugins/SearchSub/actions/searchsub.php
+++ b/plugins/SearchSub/actions/searchsub.php
@@ -63,11 +63,11 @@ class SearchsubAction extends Action
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
         if ($this->boolean('ajax')) {
-            StatusNet::setApi(true);
+            GNUsocial::setApi(true);
         }
 
         // Only allow POST requests
@@ -118,7 +118,7 @@ class SearchsubAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         // Throws exception on error