Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/peopletagautocomplete.php b/actions/peopletagautocomplete.php
index 5b6ae57a5393229126f5634e1994709021a1ada1..3daac8e86827a8f80271f19e8ec02a4ed0a3e41d 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,11 +65,10 @@ 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();
-        $tags = $profile->getLists(common_current_user());
+        $tags = $profile->getLists($this->scoped);
 
         $this->tags = array();
         while ($tags->fetch()) {
@@ -114,7 +112,7 @@ class PeopletagautocompleteAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    function handle()
     {
         //common_log(LOG_DEBUG, 'Autocomplete data: ' . json_encode($this->tags));
         if ($this->tags) {