aboutsummaryrefslogtreecommitdiffstats
path: root/include/ws_protocols
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-05-08 19:22:29 +0000
committerplegall <plg@piwigo.org>2010-05-08 19:22:29 +0000
commiteb0aec97524af79ced247393fac94ed4d14baf80 (patch)
treee0839f33af972cf307864d6153692432affdcaae /include/ws_protocols
parenta34af69677b6b7b3d1a7c551a0bb5ce5a9441d3c (diff)
bug 1652 fixed: json_encode function is required for admin.php?fckb_tags=1
(used in the new tags widget) git-svn-id: http://piwigo.org/svn/trunk@6126 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/ws_protocols')
-rw-r--r--include/ws_protocols/json_encoder.php33
1 files changed, 0 insertions, 33 deletions
diff --git a/include/ws_protocols/json_encoder.php b/include/ws_protocols/json_encoder.php
index 128c56586..badecd1ff 100644
--- a/include/ws_protocols/json_encoder.php
+++ b/include/ws_protocols/json_encoder.php
@@ -21,39 +21,6 @@
// | USA. |
// +-----------------------------------------------------------------------+
-
-#_____________________ PHP 5.2
-if (! function_exists('json_encode')) {
- function json_encode($data) {
- switch (gettype($data)) {
- case 'boolean':
- return ($data ? 'true' : 'false');
- case 'null':
- case 'NULL':
- return 'null';
- case 'integer':
- case 'double':
- return $data;
- case 'string':
- return '"'. str_replace(array("\\",'"',"/","\n","\r","\t"), array("\\\\",'\"',"\\/","\\n","\\r","\\t"), $data) .'"';
- case 'object':
- case 'array':
- if ($data === array()) return '[]'; # empty array
- if (range(0, count($data) - 1) !== array_keys($data) ) { # string keys, unordered, non-incremental keys, .. - whatever, make object
- $out = "\n".'{';
- foreach($data as $key => $value) {
- $out .= json_encode((string) $key) . ':' . json_encode($value) . ',';
- }
- $out = substr($out, 0, -1) . "\n". '}';
- }else{
- # regular array
- $out = "\n".'[' . join("\n".',', array_map('json_encode', $data)) ."\n".']';
- }
- return $out;
- }
- }
-}
-
class PwgJsonEncoder extends PwgResponseEncoder
{
function encodeResponse($response)