Merge "Remove $wgUseKeyHeader and OutputPage::getKeyHeader(), deprecated in 1.32"

[lhc/web/wiklou.git] / includes / resourceloader / ResourceLoaderModule.php

diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php
index dd7857e..0baed65 100644 (file)
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -146,10 +146,7 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
                        if ( is_string( $deprecationInfo ) ) {
                                $warning .= "\n" . $deprecationInfo;
                        }
-                       return Xml::encodeJsCall(
-                               'mw.log.warn',
-                               [ $warning ]
-                       );
+                       return 'mw.log.warn(' . ResourceLoader::encodeJsonForScript( $warning ) . ');';
                } else {
                        return '';
                }