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

[quix0rs-gnu-social.git] / lib / apilistusers.php

diff --git a/lib/apilistusers.php b/lib/apilistusers.php
index 0838228ba0248c345a18fb1c5a33ea98af97240c..cf3a86553869d3ce52944174e5cbeade7759282d 100644 (file)
--- a/lib/apilistusers.php
+++ b/lib/apilistusers.php
@@ -40,7 +40,7 @@ class ApiListUsersAction extends ApiBareAuthAction
     var $prev_cursor = 0;
     var $users = null;
 
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         // delete list member if method is DELETE or if method is POST and an argument
         // _method is set to DELETE
@@ -52,8 +52,8 @@ class ApiListUsersAction extends ApiBareAuthAction
         $this->create = (!$this->delete &&
                          $_SERVER['REQUEST_METHOD'] == 'POST');
 
-        if($this->arg('id')) {
-            $this->user = $this->getTargetUser($this->arg('id'));
+        if ($this->arg('id')) {
+            $this->target = $this->getTargetProfile($this->arg('id'));
         }
 
         parent::prepare($args);
@@ -63,7 +63,6 @@ class ApiListUsersAction extends ApiBareAuthAction
         if (empty($this->list)) {
             // TRANS: Client error displayed when referring to a non-existing list.
             $this->clientError(_('List not found.'), 404, $this->format);
-            return false;
         }
 
         if(!$this->create && !$this->delete) {
@@ -78,9 +77,9 @@ class ApiListUsersAction extends ApiBareAuthAction
             $this->create || $this->delete;
     }
 
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         if($this->delete) {
             return $this->handleDelete();
@@ -164,7 +163,7 @@ class ApiListUsersAction extends ApiBareAuthAction
     {
     }
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return false;
     }