diff options
author | Evan Prodromou <evan@status.net> | 2009-11-08 21:23:25 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-11-08 21:23:25 -0500 |
commit | aa0d9a86152d2485de6de5ec572ae87085ebe780 (patch) | |
tree | be142ab0f12a2e580aa36de31e0ceddadd0158b5 /plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php | |
parent | f086dddf43a8e1593a615e77c2fdd605623acf49 (diff) | |
parent | 8e58f241739b97bd53f78035781f16e2067a31d9 (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php')
-rw-r--r-- | plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php b/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php index 29509deba..9c6c62663 100644 --- a/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php +++ b/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php @@ -1,5 +1,5 @@ <?php -# In PHP 5.2 or higher we don't need to bring this in +# In PHP 5.2 or higher we do not need to bring this in if (!function_exists('json_encode')) { require_once 'jsonwrapper_inner.php'; } |