diff options
author | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2009-11-08 23:33:58 +0100 |
---|---|---|
committer | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2009-11-08 23:33:58 +0100 |
commit | b10f362ede8c39746c168363bf4fa6481995592b (patch) | |
tree | c7a6d4d2ca280ba50d1dbac1113507432e3fe12e /plugins/Facebook/facebook/jsonwrapper | |
parent | 5ab709b73977131813884558bf56d97172a7aa26 (diff) | |
parent | fc5002015b2a9e16a3c6b9992d55b45c73a8d2fb (diff) |
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/Facebook/facebook/jsonwrapper')
-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 92542b47d..0cddbddb4 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 cannot be encoded (e.g. resources) + * Values which can't 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 |