From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Sat, 4 Dec 2010 00:35:10 +0000 (+0000)
Subject: Made use of Xml::encodeJsCall - improves on r77693.
X-Git-Tag: 1.31.0-rc.0~33587
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=d617dd1bf43012b0505850ad334800a219b5dade;p=lhc%2Fweb%2Fwiklou.git

Made use of Xml::encodeJsCall - improves on r77693.
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 508aacea93..ddea5c263c 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2436,10 +2436,11 @@ class OutputPage {
 
 		// Modules requests - let the client calculate dependencies and batch requests as it likes
 		if ( $this->getModules() ) {
-			$modules = FormatJson::encode( $this->getModules() );
+			$modules = FormatJson::encode(  );
 			$scripts .= Html::inlineScript(
 				ResourceLoader::makeLoaderConditionalScript(
-					"mediaWiki.loader.load( {$modules} ); mediaWiki.loader.go();"
+					Xml::encodeJsCall( 'mediaWiki.loader.load', $this->getModules() ) .
+					Xml::encodeJsCall( 'mediaWiki.loader.go' )
 				)
 			) . "\n";
 		}