summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-07-10 10:06:20 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-07-10 10:06:20 -0700
commit6a0f0e32d5e837c3f0f2041bc206fc35d69f497c (patch)
treee9ce262b15006927ffc46c71a89ecb1a3ebfadbd /actions
parent03ccb74052ccec209adedfcd9daf4648905b322b (diff)
parentbafa1ab1c532118e2230df50ed18a1b4573692b7 (diff)
Merge branch '0.8.x' into 0.9.x
Diffstat (limited to 'actions')
-rw-r--r--actions/twitapiusers.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index de8326e3a..fea41b397 100644
--- 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') {