summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorDan Moore <dan@moore.cx>2009-06-05 12:53:17 -0400
committerZach Copley <zach@controlyourself.ca>2009-07-06 15:51:17 -0700
commita9c1e665701d5f5f20940143aa413faaec1a8c78 (patch)
tree51d426d90692db17c5bb107a4e97dba990714f32 /actions
parent5e067c2c813cb51c1162761aaf3a7efd883ba731 (diff)
Bringing users/show in line with Twitter as far as specifying user.
Diffstat (limited to 'actions')
-rw-r--r--actions/twitapiusers.php9
1 files changed, 1 insertions, 8 deletions
diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 4057b63e7..ee01c2a43 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)) {