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 04b9baefbe10055620e5ca3be45c1c45d1faecfa..dc083fd0282b3d7c39862d53a9a49b211d2a088e 100644 (file)
--- a/actions/peopletagautocomplete.php
+++ b/actions/peopletagautocomplete.php
@@ -44,8 +44,7 @@ class PeopletagautocompleteAction extends Action
      *
      * @return boolean success flag
      */
-
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -54,8 +53,8 @@ class PeopletagautocompleteAction extends Action
         $this->user = common_current_user();
 
         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
@@ -63,13 +62,13 @@ class PeopletagautocompleteAction extends Action
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
+            // 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->getOwnedTags(common_current_user());
+        $tags = $profile->getLists(common_current_user());
 
         $this->tags = array();
         while ($tags->fetch()) {
@@ -87,7 +86,7 @@ class PeopletagautocompleteAction extends Action
             $this->tags[] = $arr;
         }
 
-        $tags->free();
+        $tags = NULL;
 
         return true;
     }
@@ -99,7 +98,6 @@ class PeopletagautocompleteAction extends Action
      *
      * @return String time
      */
-
     function lastModified()
     {
         return strtotime($this->last_mod);
@@ -114,10 +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);