Changeset 6126 for trunk/include

Timestamp:

May 8, 2010, 9:22:29 PM (14 years ago)

Author:

plg

Message:

bug 1652 fixed: json_encode function is required for admin.php?fckb_tags=1
(used in the new tags widget)

Location:

trunk/include

Files:

• common.inc.php (modified) (1 diff)
• php_compat/json_encode.php (added)
• ws_protocols/json_encoder.php (modified) (1 diff)

trunk/include/common.inc.php

@@ -82 +82 @@
   'hash_hmac', //(hash) - enabled by default as of PHP 5.1.2
   'preg_last_error', // PHP 5 >= 5.2.0
+  'json_encode', // PHP 5 >= 5.2.0
   ) as $func)
 {

trunk/include/ws_protocols/json_encoder.php

@@ -21 +21 @@
 // | 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