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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c928bdf..8c46064 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -155,6 +155,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   external links.
 * (bug 14132) Allow user to disable bot edits from being output to UDP. 
 * (bug 14328) jsMsg() within Wikibits now accepts a DOM object, not just a string  
+* (bug 2889) MediaWiki:Print.css applies to the printable version
   
 === Bug fixes in 1.13 ===
 

diff --git a/includes/Skin.php b/includes/Skin.php
index 3f8c6b9..a406c97 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -416,7 +416,7 @@ class Skin extends Linker {
 
        # get the user/site-specific stylesheet, SkinTemplate loads via RawPage.php (settings are cached that way)
        function getUserStylesheet() {
-               global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage, $wgStyleVersion;
+               global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage, $wgStyleVersion, $wgOut;
                $sheet = $this->getStylesheet();
                $s = "@import \"$wgStylePath/common/shared.css?$wgStyleVersion\";\n";
                $s .= "@import \"$wgStylePath/common/oldshared.css?$wgStyleVersion\";\n";
@@ -428,6 +428,7 @@ class Skin extends Linker {
                        '@import "' . self::makeNSUrl( ucfirst( $this->getSkinName() . '.css' ), $query, NS_MEDIAWIKI ) . "\";\n";
 
                $s .= $this->doGetUserStyles();
+               if($wgOut->isPrintable()) $s .= '@import "' . self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI ) . "\";\n"; 
                return $s."\n";
        }
 
@@ -528,7 +529,7 @@ END;
                }
                return $s;
        }
-
+       
        function getBodyOptions() {
                global $wgUser, $wgTitle, $wgOut, $wgRequest, $wgContLang;
 

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index c60cfb4..187d9a8 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -962,7 +962,8 @@ class SkinTemplate extends Skin {
        function setupUserCss() {
                wfProfileIn( __METHOD__ );
 
-               global $wgRequest, $wgAllowUserCss, $wgUseSiteCss, $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser;
+               global $wgRequest, $wgAllowUserCss, $wgUseSiteCss, 
+                       $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser, $wgOut;
 
                $sitecss = '';
                $usercss = '';
@@ -1005,6 +1006,7 @@ class SkinTemplate extends Skin {
                        $sitecss .= '@import "' . self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI) . '";' . "\n";
                        $sitecss .= '@import "' . self::makeNSUrl( ucfirst( $this->skinname ) . '.css', $query, NS_MEDIAWIKI ) . '";' . "\n";
                        $sitecss .= '@import "' . self::makeUrl( '-', "action=raw&gen=css$siteargs$skinquery" ) . '";' . "\n";
+                       if( $wgOut->isPrintable()) $sitecss .= '@import "' . self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI) . '";' . "\n";
                }
 
                # If we use any dynamic CSS, make a little CDATA block out of it.