summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-07-06 15:48:14 -0700
committerZach Copley <zach@controlyourself.ca>2009-07-06 15:48:14 -0700
commit701a237e8ce8790804da25fe5aaf989d88a05fdf (patch)
treeb16daf99763f54aa22dce71a49f5b7d50078a396 /actions
parented21af0d1db3c5937523af130d26dd573b473fc3 (diff)
parent40e05a3e86559bb9bd7094519003d3c7d90501a5 (diff)
Merge branch 'mgrdcm-review' into 0.7.x
* mgrdcm-review: 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 b90bbfa98..0461efcb4 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -35,20 +35,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 (!$user) {