Split mediawiki.legacy.shared into mediawiki.legacy.shared and mediawiki.legacy.oldsh...

diff --git a/includes/Skin.php b/includes/Skin.php
index 7295a83..a57cc18 100644 (file)
--- 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 9cec48d..02df836 100644 (file)
--- 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 eadbdd0..05e9ba0 100644 (file)
--- 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',