die( 1 );
}
+require_once dirname( __FILE__ ) . '/Services_JSON.php';
+
class FormatJson {
/**
* @param $value Mixed: the value being encoded. Can be any type except a resource.
* @param $isHtml Boolean
*
- * @fixme "$isHtml" parameter's purpose is not documented. It appears to
+ * @todo FIXME: "$isHtml" parameter's purpose is not documented. It appears to
* map to a parameter labeled "pretty-print output with indents and
* newlines" in Services_JSON::encode(), which has no string relation
* to HTML output.
// Some versions of PHP have a broken json_encode, see PHP bug
// 46944. Test encoding an affected character (U+20000) to
// avoid this.
- if ( !function_exists( 'json_encode' ) || $isHtml || strtolower( json_encode( "\xf0\xa0\x80\x80" ) ) != '\ud840\udc00' ) {
+ if ( !function_exists( 'json_encode' ) || $isHtml || strtolower( json_encode( "\xf0\xa0\x80\x80" ) ) != '"\ud840\udc00"' ) {
$json = new Services_JSON();
return $json->encode( $value, $isHtml );
} else {
*/
public static function decode( $value, $assoc = false ) {
if ( !function_exists( 'json_decode' ) ) {
- $json = new Services_JSON();
+ if( $assoc )
+ $json = new Services_JSON( SERVICES_JSON_LOOSE_TYPE );
+ else
+ $json = new Services_JSON();
$jsonDec = $json->decode( $value );
- if( $assoc ) {
- $jsonDec = wfObjectToArray( $jsonDec );
- }
return $jsonDec;
} else {
return json_decode( $value, $assoc );
}
}
-}
\ No newline at end of file
+}