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

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

diff --git a/actions/peopletagautocomplete.php b/actions/peopletagautocomplete.php
index 5b6ae57a5393229126f5634e1994709021a1ada1..dc083fd0282b3d7c39862d53a9a49b211d2a088e 100644 (file)
--- a/actions/peopletagautocomplete.php
+++ b/actions/peopletagautocomplete.php
@@ -44,7 +44,7 @@ class PeopletagautocompleteAction extends Action
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -55,7 +55,6 @@ class PeopletagautocompleteAction extends Action
         if (empty($this->user)) {
             // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_('Not logged in.'));
-            return false;
         }
 
         // CSRF protection
@@ -66,7 +65,6 @@ class PeopletagautocompleteAction extends Action
             // TRANS: Client error displayed when the session token does not match or is not given.
             $this->clientError(_('There was a problem with your session token.'.
                                  ' Try again, please.'));
-            return false;
         }
 
         $profile = $this->user->getProfile();
@@ -114,9 +112,9 @@ class PeopletagautocompleteAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
-        //common_log(LOG_DEBUG, 'Autocomplete data: ' . json_encode($this->tags));
+        //common_debug('Autocomplete data: ' . json_encode($this->tags));
         if ($this->tags) {
             print(json_encode($this->tags));
             exit(0);