diff options
| author | Brion Vibber <brion@status.net> | 2010-08-10 15:01:29 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@status.net> | 2010-08-10 15:01:29 -0700 |
| commit | 819d33210d298de74b64dc7ead79e9d9b223b12e (patch) | |
| tree | 902d42087e633b96e12bef699f6c80e7342c9312 /actions/apifriendshipsexists.php | |
| parent | 8f071b2818e8321ea910df612016175f65093402 (diff) | |
| parent | 08fc6053ec55e911b842fd05dafc5e0c99c4e992 (diff) | |
Merge branch '0.9.x' into tinymce
Diffstat (limited to 'actions/apifriendshipsexists.php')
| -rw-r--r-- | actions/apifriendshipsexists.php | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/actions/apifriendshipsexists.php b/actions/apifriendshipsexists.php index ca62b5f51..725178fd4 100644 --- a/actions/apifriendshipsexists.php +++ b/actions/apifriendshipsexists.php @@ -24,7 +24,7 @@ * @author Dan Moore <dan@moore.cx> * @author Evan Prodromou <evan@status.net> * @author Zach Copley <zach@status.net> - * @copyright 2009 StatusNet, Inc. + * @copyright 2009-2010 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -50,8 +50,8 @@ require_once INSTALLDIR . '/lib/apiprivateauth.php'; class ApiFriendshipsExistsAction extends ApiPrivateAuthAction { - var $user_a = null; - var $user_b = null; + var $profile_a = null; + var $profile_b = null; /** * Take arguments for running @@ -66,11 +66,8 @@ class ApiFriendshipsExistsAction extends ApiPrivateAuthAction { parent::prepare($args); - $user_a_id = $this->trimmed('user_a'); - $user_b_id = $this->trimmed('user_b'); - - $this->user_a = $this->getTargetUser($user_a_id); - $this->user_b = $this->getTargetUser($user_b_id); + $this->profile_a = $this->getTargetProfile($this->trimmed('user_a')); + $this->profile_b = $this->getTargetProfile($this->trimmed('user_b')); return true; } @@ -89,16 +86,16 @@ class ApiFriendshipsExistsAction extends ApiPrivateAuthAction { parent::handle($args); - if (empty($this->user_a) || empty($this->user_b)) { + if (empty($this->profile_a) || empty($this->profile_b)) { $this->clientError( - _('Two user ids or screen_names must be supplied.'), + _('Two valid IDs or screen_names must be supplied.'), 400, $this->format ); return; } - $result = $this->user_a->isSubscribed($this->user_b); + $result = Subscription::exists($this->profile_a, $this->profile_b); switch ($this->format) { case 'xml': |