X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderClientHtml.php;h=5c072bfdec6fb195a9ce7ef94d57af158bd0163c;hb=74d04edec385aa86ee01943b9a27475d79f74e78;hp=b9ff7325ac8b980a30dffa701d20665aec079d0c;hpb=369b34f0ae64076b91df63e7432f5bf6f19a76a6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderClientHtml.php b/includes/resourceloader/ResourceLoaderClientHtml.php
index b9ff7325ac..5c072bfdec 100644
--- a/includes/resourceloader/ResourceLoaderClientHtml.php
+++ b/includes/resourceloader/ResourceLoaderClientHtml.php
@@ -95,7 +95,6 @@ class ResourceLoaderClientHtml {
 	/**
 	 * Ensure the styles of one or more modules are loaded.
 	 *
-	 * @deprecated since 1.28
 	 * @param array $modules Array of module names
 	 */
 	public function setModuleStyles( array $modules ) {
@@ -305,7 +304,10 @@ class ResourceLoaderClientHtml {
 		// Inline RLQ: Load general modules
 		if ( $data['general'] ) {
 			$chunks[] = ResourceLoader::makeInlineScript(
-				Xml::encodeJsCall( 'mw.loader.load', [ $data['general'] ] ),
+				'RLPAGEMODULES='
+					. ResourceLoader::encodeJsonForScript( $data['general'] )
+					. ';'
+					. 'mw.loader.load(RLPAGEMODULES);',
 				$nonce
 			);
 		}
@@ -406,7 +408,8 @@ class ResourceLoaderClientHtml {
 	 * @param array $modules One or more module names
 	 * @param string $only ResourceLoaderModule TYPE_ class constant
 	 * @param array $extraQuery [optional] Array with extra query parameters for the request
-	 * @param string $nonce [optional] Content-Security-Policy nonce (from OutputPage::getCSPNonce)
+	 * @param string|null $nonce [optional] Content-Security-Policy nonce
+	 *  (from OutputPage::getCSPNonce)
 	 * @return string|WrappedStringList HTML
 	 */
 	public static function makeLoad( ResourceLoaderContext $mainContext, array $modules, $only,