From: Catrope <roan.kattouw@gmail.com>
Date: Mon, 16 Apr 2012 17:32:05 +0000 (-0700)
Subject: (bug 34669) Disable CSS concatenation, breaks @import
X-Git-Tag: 1.31.0-rc.0~23901^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=475bd8e53b423a6c417f0264c3b8ebd8a536786a;p=lhc%2Fweb%2Fwiklou.git

(bug 34669) Disable CSS concatenation, breaks @import

Disabled with if(false) so we can deploy this code safely without
breaking @import , should be reenabled or cleaned up once we've figured
out how to handle this properly.

Change-Id: I067108755915e2a0d342738b9f617b3f11a52705
---

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index eebbab21b0..e477705c3f 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -431,7 +431,8 @@ var mw = ( function ( $, undefined ) {
 			function addInlineCSS( css ) {
 				var $style, style, $newStyle;
 				$style = getMarker().prev();
-				if ( $style.is( 'style' ) && $style.data( 'ResourceLoaderDynamicStyleTag' ) === true ) {
+				// Disable <style> tag recycling/concatenation because of bug 34669
+				if ( false && $style.is( 'style' ) && $style.data( 'ResourceLoaderDynamicStyleTag' ) === true ) {
 					// There's already a dynamic <style> tag present, append to it. This recycling of
 					// <style> tags is for bug 31676 (can't have more than 32 <style> tags in IE)
 					style = $style.get( 0 );