Changeset 13863

Timestamp:

03/28/2010 04:42:44 AM (16 years ago)

Author:

dd32

Message:

Implement the 2nd parameter of json_decode() for back-compat purposes. Returns an associative array instead of an object. For the recursive object handling, Props carbolineum. Fixes #11963

File:

• trunk/wp-includes/compat.php (modified) (1 diff)

trunk/wp-includes/compat.php

@@ -149 +149 @@
                 $res = $wp_json->decode( $string );
                 if ( $assoc_array )
-                        $res = get_object_vars( $res );
+                        $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;
         }
 }