From: Max Semenik <maxsem@users.mediawiki.org>
Date: Tue, 14 Sep 2010 11:58:09 +0000 (+0000)
Subject: Follow-up r72941: don't use json_encode() directly
X-Git-Tag: 1.31.0-rc.0~34935
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=271f6392ea836bb8142578a7cafd0897a05a8e2b;p=lhc%2Fweb%2Fwiklou.git

Follow-up r72941: don't use json_encode() directly
---

diff --git a/includes/ResourceLoader.php b/includes/ResourceLoader.php
index 01a909f1a6..4e7b08480a 100644
--- a/includes/ResourceLoader.php
+++ b/includes/ResourceLoader.php
@@ -149,7 +149,7 @@ class ResourceLoader {
 		foreach ( self::$modules as $name => $module ) {
 			// Support module loader scripts
 			if ( ( $loader = $module->getLoaderScript() ) !== false ) {
-				$deps = json_encode( $module->getDependencies() );
+				$deps = FormatJson::encode( $module->getDependencies() );
 				$version = wfTimestamp( TS_ISO_8601, round( $module->getModifiedTime( $context ), -2 ) );
 				$scripts .= "( function( name, version, dependencies ) { $loader } )( '$name', '$version', $deps );";
 			}