Fixes for r84057 LanguageTr uc/lc:

[lhc/web/wiklou.git] / includes / json / FormatJson.php

diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index 04024f8..006f772 100644 (file)
--- 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
+}