* (bug 2889) MediaWiki:Print.css applies to the printable version

MediaWiki:Handheld.css and MediaWiki:Print.css now available (handheld only if $wgHandheldStyle is configured).

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 69a8f6d..a4bef36 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -112,6 +112,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   displaying an external image inline.
 * (bugs 15405, 15436) Sort more currency types correctly in sortable tables
 * (bug 15422) Sort more different types of numbers in sortable tables
+* (bug 2889) MediaWiki:Print.css applies to the printable version
 
 === Bug fixes in 1.14 ===
 

diff --git a/includes/Skin.php b/includes/Skin.php
index 9296d24..5dd109f 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -566,6 +566,7 @@ END;
                // If we use the site's dynamic CSS, throw that in, too
                // Per-site custom styles
                if( $wgUseSiteCss ) {
+                       global $wgHandheldStyle;
                        $query = wfArrayToCGI( array(
                                'usemsgcache' => 'yes',
                                'ctype' => 'text/css',
@@ -573,6 +574,10 @@ END;
                        ) + $siteargs );
                        # Site settings must override extension css! (bug 15025)
                        $out->addStyle( self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI) );
+                       $out->addStyle( self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI), "print" );
+                       if( $wgHandheldStyle ) {
+                               $out->addStyle( self::makeNSUrl( 'Handheld.css', $query, NS_MEDIAWIKI), "handheld" );
+                       }
                        $out->addStyle( self::makeNSUrl( $this->getSkinName() . '.css', $query, NS_MEDIAWIKI ) );
                }