FormatJson_loose_typing_fix.patch
Public
Actions

Authored By

	• bzimport
	Nov 21 2014, 11:08 PM

Size

641 B

Referenced Files

None

Subscribers

None

FormatJson_loose_typing_fix.patch
View Options

	Index: json/FormatJson.php
	===================================================================
	--- json/FormatJson.php (revision 67579)
	+++ json/FormatJson.php (working copy)
	@@ -21,11 +21,11 @@

	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 );