* fixed json mapping issue for no-mediawiki instance

diff --git a/js2/mwEmbed/php/noMediaWikiConfig.php b/js2/mwEmbed/php/noMediaWikiConfig.php
index e6b3f7d..cf1024b 100644 (file)
--- a/js2/mwEmbed/php/noMediaWikiConfig.php
+++ b/js2/mwEmbed/php/noMediaWikiConfig.php
@@ -18,8 +18,6 @@ $wgFileCacheDirectory = realpath( dirname( __FILE__ ) ) . '/script-cache';
 
 $wgUseFileCache = true;
 
-$wgEnableScriptLoaderJsFile = false;
-
 // Init our wg Globals
 $wgJSAutoloadClasses = array();
 $wgJSAutoloadLocalClasses = array();
@@ -105,28 +103,14 @@ function wfMsgNoTrans( $msgKey ) {
         return '<' . $msgKey . '>';
     }
 }
+/* mediaWiki abstracts the json functions with fallbacks
+* here we just map directly to the call */
 class FormatJson{
        public static function encode($value, $isHtml=false){
-               // 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') {
-                       $json = new Services_JSON();
-                       return $json->encode($value, $isHtml) ;
-               } else {
-                       return json_encode($value);
-               }
+               return json_encode($value);
        }
        public static function decode( $value, $assoc=false ){
-               if (!function_exists('json_decode') ) {
-                       $json = new Services_JSON();
-                       $jsonDec = $json->decode( $value );
-                       if( $assoc )
-                               $jsonDec = wfObjectToArray( $jsonDec );
-                       return $jsonDec;
-               } else {
-                       return json_decode( $value, $assoc );
-               }
+               return json_decode( $value, $assoc );
        }
 }