X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapilistsubscriber.php;h=a19ceec2fd93b18cf92550a04aedbc8a698b5045;hb=d6b28c64830f632bb2f4b6f3c9369b9e56ad217a;hp=9d7fde329f3ec6a474ea14b65dac42f4f7aa691a;hpb=a9c4bcd71f0ce046bd57ea727c140c6e91fcd013;p=quix0rs-gnu-social.git diff --git a/actions/apilistsubscriber.php b/actions/apilistsubscriber.php index 9d7fde329f..a19ceec2fd 100644 --- a/actions/apilistsubscriber.php +++ b/actions/apilistsubscriber.php @@ -33,45 +33,39 @@ class ApiListSubscriberAction extends ApiBareAuthAction { var $list = null; - function prepare($args) + function prepare(array $args=array()) { parent::prepare($args); - $this->user = $this->getTargetUser($this->arg('id')); + $this->target = $this->getTargetProfile($this->arg('id')); $this->list = $this->getTargetList($this->arg('user'), $this->arg('list_id')); if (empty($this->list)) { // TRANS: Client error displayed trying to perform an action related to a non-existing list. - $this->clientError(_('List not found.'), 404, $this->format); - return false; + $this->clientError(_('List not found.'), 404); } - if (empty($this->user)) { + if (!($this->target instanceof Profile)) { // TRANS: Client error displayed trying to perform an action related to a non-existing user. - $this->clientError(_('No such user.'), 404, $this->format); - return false; + $this->clientError(_('No such user.'), 404); } return true; } - function handle($args) + function handle(array $args=array()) { parent::handle($args); $arr = array('profile_tag_id' => $this->list->id, - 'profile_id' => $this->user->id); + 'profile_id' => $this->target->id); $sub = Profile_tag_subscription::pkeyGet($arr); if(empty($sub)) { - $this->clientError( - // TRANS: Client error displayed when a membership check for a user is nagative. - _('The specified user is not a subscriber of this list.'), - 400, - $this->format - ); + // TRANS: Client error displayed when a membership check for a user is nagative. + $this->clientError(_('The specified user is not a subscriber of this list.')); } - $user = $this->twitterUserArray($this->user->getProfile(), true); + $user = $this->twitterUserArray($this->target, true); switch($this->format) { case 'xml':