diff options
author | Brion Vibber <brion@pobox.com> | 2009-10-13 16:45:26 +0000 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2009-10-13 16:45:26 +0000 |
commit | 834ac7aa1172518c112bbf90561ead34499e20b8 (patch) | |
tree | 474dc49eed8ff3542e6d2c8154e14fa4b8432ada /actions/twitapistatuses.php | |
parent | 18df82ba2302d5b72bc42f4d3296d6fff7d16341 (diff) | |
parent | 006cfc528edab32548d1265df5dada09a1536aed (diff) |
Merge branch '0.8.x' of git@gitorious.org:~brion/statusnet/brion-fixes into 0.8.x
Diffstat (limited to 'actions/twitapistatuses.php')
-rw-r--r-- | actions/twitapistatuses.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php index 5e2867ea8..360dff27c 100644 --- a/actions/twitapistatuses.php +++ b/actions/twitapistatuses.php @@ -297,7 +297,7 @@ class TwitapistatusesAction extends TwitterapiAction $source, 1, $reply_to); if (is_string($notice)) { - $this->serverError($notice); + $this->serverError($notice, 500, $apidata['content-type']); return; } @@ -454,7 +454,7 @@ class TwitapistatusesAction extends TwitterapiAction function friends($args, $apidata) { parent::handle($args); - $includeStatuses=! (boolean) $args['lite']; + $includeStatuses= !(array_key_exists('lite', $args) and $args['lite']); return $this->subscriptions($apidata, 'subscribed', 'subscriber', false, $includeStatuses); } @@ -467,7 +467,7 @@ class TwitapistatusesAction extends TwitterapiAction function followers($args, $apidata) { parent::handle($args); - $includeStatuses=! (boolean) $args['lite']; + $includeStatuses= !(array_key_exists('lite', $args) and $args['lite']); return $this->subscriptions($apidata, 'subscriber', 'subscribed', false, $includeStatuses); } |