diff options
| author | Brion Vibber <brion@pobox.com> | 2009-11-08 23:27:24 +0100 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2009-11-08 23:27:24 +0100 |
| commit | ec6a38a62786c85e8ee30c5726ea81f82465b39d (patch) | |
| tree | 31bb66f24f8fb4de55d9f6a21728278fcac804a1 /plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php | |
| parent | c7961fe6dc033d1d40ab7d7f9bb994492ae4ea7b (diff) | |
| parent | 104a47e4a2903f1c7ea73363a73cee12f0cf14ac (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php')
| -rw-r--r-- | plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php b/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php index 0cddbddb4..92542b47d 100644 --- a/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php +++ b/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php @@ -124,7 +124,7 @@ class Services_JSON * "{...}" syntax creates associative arrays * instead of objects in decode(). * - SERVICES_JSON_SUPPRESS_ERRORS: error suppression. - * Values which can't be encoded (e.g. resources) + * Values which cannot be encoded (e.g. resources) * appear as NULL instead of throwing errors. * By default, a deeply-nested resource will * bubble up with an error, so all return values |