X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fjson%2FFormatJson.php;h=006f7720d239799c3c91fc80f6bf343dff330a76;hb=4b524499703763110847ebf2881b7e5b4a052119;hp=04024f8d54c78426e4745008942ccb43ac46b907;hpb=8982ac25b753646c20bd0ac8f18c26fd7b46afa9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index 04024f8d54..006f7720d2 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -9,6 +9,8 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 	die( 1 );
 }
 
+require_once dirname( __FILE__ ) . '/Services_JSON.php';
+
 class FormatJson {
 	
 	/**
@@ -17,7 +19,7 @@ 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.
@@ -28,7 +30,7 @@ class FormatJson {
 		// 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 {
@@ -60,4 +62,4 @@ class FormatJson {
 		}
 	}
 	
-}
\ No newline at end of file
+}