From: Dan Moore Date: Fri, 5 Jun 2009 16:53:17 +0000 (-0400) Subject: Bringing users/show in line with Twitter as far as specifying user. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a9c1e665701d5f5f20940143aa413faaec1a8c78;p=quix0rs-gnu-social.git Bringing users/show in line with Twitter as far as specifying user. --- diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php index 4057b63e74..ee01c2a433 100644 --- a/actions/twitapiusers.php +++ b/actions/twitapiusers.php @@ -37,20 +37,13 @@ class TwitapiusersAction extends TwitterapiAction $user = null; $email = $this->arg('email'); - $user_id = $this->arg('user_id'); // XXX: email field deprecated in Twitter's API - // XXX: Also: need to add screen_name param - if ($email) { $user = User::staticGet('email', $email); - } elseif ($user_id) { - $user = $this->get_user($user_id); - } elseif (isset($apidata['api_arg'])) { + } else { $user = $this->get_user($apidata['api_arg']); - } elseif (isset($apidata['user'])) { - $user = $apidata['user']; } if (empty($user)) {