From 78d727453deabb433e229cc29e72fa9c387b0158 Mon Sep 17 00:00:00 2001 From: Ori Livneh Date: Fri, 14 Aug 2015 11:49:33 -0700 Subject: [PATCH] ResourceLoader: apply minify-js filter to config scripts Minify the JavaScript generated in ResourceLoader::makeConfigSetScript() unless debug mode is set. Change-Id: I45b5839803546c8e35e74b72c679777815294315 --- includes/resourceloader/ResourceLoader.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php index 408487b661..cd07334513 100644 --- a/includes/resourceloader/ResourceLoader.php +++ b/includes/resourceloader/ResourceLoader.php @@ -1409,11 +1409,13 @@ MESSAGE; * @return string */ public static function makeConfigSetScript( array $configuration ) { - return Xml::encodeJsCall( - 'mw.config.set', - array( $configuration ), - ResourceLoader::inDebugMode() - ); + if ( ResourceLoader::inDebugMode() ) { + return Xml::encodeJsCall( 'mw.config.set', array( $configuration ), true ); + } + + $config = RequestContext::getMain()->getConfig(); + $js = Xml::encodeJsCall( 'mw.config.set', array( $configuration ), false ); + return self::applyFilter( 'minify-js', $js, $config ); } /** -- 2.20.1