Merge branch 'testing'

1 files changed, 10 insertions, 10 deletions

diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 4057b63e7..fea41b397 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -37,24 +37,24 @@ 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'])) {
-            $user = $this->get_user($apidata['api_arg']);
-        } elseif (isset($apidata['user'])) {
-            $user = $apidata['user'];
+        } else {
+            $user = $this->get_user($apidata['api_arg'], $apidata);
         }
 
         if (empty($user)) {
-            $this->client_error(_('Not found.'), 404, $apidata['content-type']);
+            $this->clientError(_('Not found.'), 404, $apidata['content-type']);
+            return;
+        }
+
+        $profile = $user->getProfile();
+
+        if (!$profile) {
+            common_server_error(_('User has no profile.'));
             return;
         }