http://www.mediawiki.org/wiki/Special:Code/MediaWiki/98625
Revision: 98625 Author: nikerabbit Date: 2011-10-01 19:57:19 +0000 (Sat, 01 Oct 2011) Log Message: ----------- Swap json_decode to FormatJson::decode Modified Paths: -------------- trunk/extensions/Translate/FFS.php Modified: trunk/extensions/Translate/FFS.php =================================================================== --- trunk/extensions/Translate/FFS.php 2011-10-01 19:52:49 UTC (rev 98624) +++ trunk/extensions/Translate/FFS.php 2011-10-01 19:57:19 UTC (rev 98625) @@ -1081,7 +1081,7 @@ $filename = addcslashes( $filename, '\\"' ); $command = wfEscapeShellArg( "import simplejson as json; execfile(\"$filename\"); print json.dumps(msg)" ); $json = wfShellExec( "python -c $command" ); - self::$data[$this->group->getId()] = json_decode( $json, true ); + self::$data[$this->group->getId()] = FormatJson::decode( $json, true ); } if ( !isset( self::$data[$this->group->getId()][$code] ) ) { _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs