diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-07-10 10:03:57 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-07-10 10:03:57 -0700 |
| commit | bafa1ab1c532118e2230df50ed18a1b4573692b7 (patch) | |
| tree | a11a35affda3f2a1d74cfe450a5ceaa230af2ca5 /actions | |
| parent | 15f6309deacf64e6b408d45a4eb19852d36f9f72 (diff) | |
| parent | 91684830e55dd0e6a9e069ff140e17a929dd2364 (diff) | |
Merge branch '0.7.x' into 0.8.x
Conflicts:
README
actions/twitapiusers.php
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/twitapiusers.php | 7 |
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') { |