Changeset 18404

Timestamp:

07/06/2011 11:33:05 PM (14 years ago)

Author:

nacin

Message:

Restore compat for json_decode and json_encode. fixes #18015 for trunk.

Location:

trunk

Files:

• wp-admin/includes/update-core.php (modified) (1 diff)
• wp-includes/class-json.php (added)
• wp-includes/compat.php (modified) (1 diff)

trunk/wp-admin/includes/update-core.php

@@ -245 +245 @@
 // 3.2
 'wp-includes/default-embeds.php',
-'wp-includes/class-json.php',
 'wp-includes/js/tinymce/plugins/wordpress/img/more.gif',
 'wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif',

trunk/wp-includes/compat.php

@@ -61 +61 @@
     return $hmac;
 }
+
+if ( !function_exists('json_encode') ) {
+    function json_encode( $string ) {
+        global $wp_json;
+
+        if ( !is_a($wp_json, 'Services_JSON') ) {
+            require_once( ABSPATH . WPINC . '/class-json.php' );
+            $wp_json = new Services_JSON();
+        }
+
+        return $wp_json->encodeUnsafe( $string );
+    }
+}
+
+if ( !function_exists('json_decode') ) {
+    function json_decode( $string, $assoc_array = false ) {
+        global $wp_json;
+
+        if ( !is_a($wp_json, 'Services_JSON') ) {
+            require_once( ABSPATH . WPINC . '/class-json.php' );
+            $wp_json = new Services_JSON();
+        }
+
+        $res = $wp_json->decode( $string );
+        if ( $assoc_array )
+            $res = _json_decode_object_helper( $res );
+        return $res;
+    }
+    function _json_decode_object_helper($data) {
+        if ( is_object($data) )
+            $data = get_object_vars($data);
+        return is_array($data) ? array_map(__FUNCTION__, $data) : $data;
+    }
+}