From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Wed, 8 Sep 2010 00:04:48 +0000 (+0000)
Subject: Split mediawiki.legacy.shared into mediawiki.legacy.shared and mediawiki.legacy.oldsh... 
X-Git-Tag: 1.31.0-rc.0~35102
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=a36ac0395c2aa11e3cfed66574d955762a428af1;p=lhc%2Fweb%2Fwiklou.git

Split mediawiki.legacy.shared into mediawiki.legacy.shared and mediawiki.legacy.oldshared - as it should have been.
---

diff --git a/includes/Skin.php b/includes/Skin.php
index 7295a83b3a..a57cc18dcc 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -723,8 +723,8 @@ CSS;
 	 * @param $out OutputPage
 	 */
 	function setupSkinUserCss( OutputPage $out ) {
-		// This includes the shared.js and oldshared.js files from skins/common/
 		$out->addModuleStyles( 'mediawiki.legacy.shared' );
+		$out->addModuleStyles( 'mediawiki.legacy.oldshared' );
 		// TODO: Figure out how to best integrate this stuff into ResourceLoader
 		$out->addStyle( $this->getStylesheet() );
 		$out->addStyle( 'common/common_rtl.css', '', '', 'rtl' );
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 9cec48d2ca..02df836186 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -108,7 +108,8 @@ class SkinTemplate extends Skin {
 	 */
 	function setupSkinUserCss( OutputPage $out ){
 		$out->addModuleStyles( 'mediawiki.legacy.shared' );
-		$out->addModuleStyles( 'mediawiki.legacy.commonPrint' );
+		// ResourceLoader does not support CSS media types yet, so we must include this on it's own the old way
+		$out->addStyle( 'common/commonPrint.css', 'print' );
 	}
 
 	/**
diff --git a/resources/Resources.php b/resources/Resources.php
index eadbdd044a..05e9ba0f5d 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -350,7 +350,10 @@ ResourceLoader::register( array(
 		'dependencies' => 'mediawiki.legacy.wikibits',
 	) ),
 	'mediawiki.legacy.shared' => new ResourceLoaderFileModule( array(
-		'styles' => array( 'skins/common/shared.css', 'skins/common/oldshared.css' ),
+		'styles' => 'skins/common/shared.css',
+	) ),
+	'mediawiki.legacy.oldshared' => new ResourceLoaderFileModule( array(
+		'styles' => 'skins/common/oldshared.css',
 	) ),
 	'mediawiki.legacy.upload' => new ResourceLoaderFileModule( array(
 		'scripts' => 'skins/common/upload.js',