Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/peopletagautocomplete.php b/actions/peopletagautocomplete.php
index 86d63545dcb0b4ed2aa4040e78aef8e8ebf9899e..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);
 
@@ -68,7 +68,7 @@ class PeopletagautocompleteAction extends Action
         }
 
         $profile = $this->user->getProfile();
-        $tags = $profile->getLists(common_current_user());
+        $tags = $profile->getLists($this->scoped);
 
         $this->tags = array();
         while ($tags->fetch()) {
@@ -112,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) {