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

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 508aace..ddea5c2 100644 (file)
--- 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";
                }