From: Krinkle <krinkle@users.mediawiki.org>
Date: Sat, 17 Sep 2011 02:32:36 +0000 (+0000)
Subject: [RL] pass 'media' property to <link> tags as well (in already did it for the <style... 
X-Git-Tag: 1.31.0-rc.0~27594
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=de72c4ed1484f2055d6536294ee995893b81a282;p=lhc%2Fweb%2Fwiklou.git

[RL] pass 'media' property to <link> tags as well (in already did it for the <style> tags). Fixes debug-mode bug where print stylesheet were loaded in e.g. 'skins.modern'.
*  (Follows-up r88053 c22683 CR)
* Whitespace fix in Resources.php
---

diff --git a/resources/Resources.php b/resources/Resources.php
index b5ceed1c00..1d0a5a4497 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -47,8 +47,10 @@ return array(
 		'localBasePath' => $GLOBALS['wgStyleDirectory'],
 	),
 	'skins.modern' => array(
-		'styles' => array( 'modern/main.css' => array( 'media' => 'screen' ),
-				'modern/print.css' => array( 'media' => 'print' ) ),
+		'styles' => array(
+			'modern/main.css' => array( 'media' => 'screen' ),
+			'modern/print.css' => array( 'media' => 'print' ),
+		),
 		'remoteBasePath' => $GLOBALS['wgStylePath'],
 		'localBasePath' => $GLOBALS['wgStyleDirectory'],
 	),
diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index f03b2ce814..7da282173d 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -521,6 +521,7 @@ window.mw = window.mediaWiki = new ( function( $ ) {
 						for ( var i = 0; i < style.length; i++ ) {
 							getMarker().before( mw.html.element( 'link', {
 								'type': 'text/css',
+								'media': media,
 								'rel': 'stylesheet',
 								'href': style[i]
 							} ) );