From: Ori Livneh <ori@wikimedia.org>
Date: Fri, 14 Aug 2015 18:49:33 +0000 (-0700)
Subject: ResourceLoader: apply minify-js filter to config scripts
X-Git-Tag: 1.31.0-rc.0~10421^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=78d727453deabb433e229cc29e72fa9c387b0158;p=lhc%2Fweb%2Fwiklou.git

ResourceLoader: apply minify-js filter to config scripts

Minify the JavaScript generated in ResourceLoader::makeConfigSetScript() unless
debug mode is set.

Change-Id: I45b5839803546c8e35e74b72c679777815294315
---

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 );
 	}
 
 	/**