Merge remote-tracking branch 'upstream/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 dcd072e8f85922432b93ab6bc95c0750508e9653..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
@@ -76,7 +76,6 @@ class SearchsubAction extends Action
             // TRANS: Client error displayed trying to perform any request method other than POST.
             // TRANS: Do not translate POST.
             $this->clientError(_m('This action only accepts POST requests.'));
-            return false;
         }
 
         // CSRF protection
@@ -87,7 +86,6 @@ class SearchsubAction extends Action
             // TRANS: Client error displayed when the session token is not okay.
             $this->clientError(_m('There was a problem with your session token.'.
                                  ' Try again, please.'));
-            return false;
         }
 
         // Only for logged-in users
@@ -97,7 +95,6 @@ class SearchsubAction extends Action
         if (empty($this->user)) {
             // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_m('Not logged in.'));
-            return false;
         }
 
         // Profile to subscribe to
@@ -107,7 +104,6 @@ class SearchsubAction extends Action
         if (empty($this->search)) {
             // TRANS: Client error displayed trying to subscribe to a non-existing profile.
             $this->clientError(_m('No such profile.'));
-            return false;
         }
 
         return true;
@@ -122,7 +118,7 @@ class SearchsubAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         // Throws exception on error