Merge "Revert "Load 'mediawiki.legacy.commonPrint' styles with a media type property""

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 12651d7..552e181 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2905,8 +2905,7 @@ class OutputPage extends ContextSource {
 
                                // Automatically select style/script elements
                                if ( $only === ResourceLoaderModule::TYPE_STYLES ) {
-                                       $media = $group === 'print' ? 'print' : 'all';
-                                       $link = Html::linkedStyle( $url, $media );
+                                       $link = Html::linkedStyle( $url );
                                } else {
                                        if ( $context->getRaw() || $isRaw ) {
                                                // Startup module can't load itself, needs to use <script> instead of mw.loader.load

diff --git a/resources/Resources.php b/resources/Resources.php
index b581485..8fc9bdd 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1758,7 +1758,6 @@ return array(
                        'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' => array( 'media' => 'print' ),
                        'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' )
                ),
-               'group' => 'print',
        ),
        'mediawiki.legacy.protect' => array(
                'scripts' => 'resources/src/mediawiki.legacy/protect.js',