Merge branch '0.7.x' into 0.8.x

[quix0rs-gnu-social.git] / actions / twitapiusers.php

diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index de8326e3adcc481bb77272d4ba14965ea7c4c397..fea41b3971d3f9a77b342e6304f6e83e96fa6784 100644 (file)
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -51,6 +51,13 @@ class TwitapiusersAction extends TwitterapiAction
             return;
         }
 
+        $profile = $user->getProfile();
+
+        if (!$profile) {
+            common_server_error(_('User has no profile.'));
+            return;
+        }
+
         $twitter_user = $this->twitter_user_array($user->getProfile(), true);
 
         if ($apidata['content-type'] == 'xml') {