Merge branch 'mgrdcm-review' into 0.7.x

* mgrdcm-review:
  Bringing users/show in line with Twitter as far as specifying user.

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) {