| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -962,7 +962,8 @@ |
| 963 | 963 | function setupUserCss() { |
| 964 | 964 | wfProfileIn( __METHOD__ ); |
| 965 | 965 | |
| 966 | | - global $wgRequest, $wgAllowUserCss, $wgUseSiteCss, $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser; |
| | 966 | + global $wgRequest, $wgAllowUserCss, $wgUseSiteCss, |
| | 967 | + $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser, $wgOut; |
| 967 | 968 | |
| 968 | 969 | $sitecss = ''; |
| 969 | 970 | $usercss = ''; |
| — | — | @@ -1005,6 +1006,7 @@ |
| 1006 | 1007 | $sitecss .= '@import "' . self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI) . '";' . "\n"; |
| 1007 | 1008 | $sitecss .= '@import "' . self::makeNSUrl( ucfirst( $this->skinname ) . '.css', $query, NS_MEDIAWIKI ) . '";' . "\n"; |
| 1008 | 1009 | $sitecss .= '@import "' . self::makeUrl( '-', "action=raw&gen=css$siteargs$skinquery" ) . '";' . "\n"; |
| | 1010 | + if( $wgOut->isPrintable()) $sitecss .= '@import "' . self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI) . '";' . "\n"; |
| 1009 | 1011 | } |
| 1010 | 1012 | |
| 1011 | 1013 | # If we use any dynamic CSS, make a little CDATA block out of it. |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -416,7 +416,7 @@ |
| 417 | 417 | |
| 418 | 418 | # get the user/site-specific stylesheet, SkinTemplate loads via RawPage.php (settings are cached that way) |
| 419 | 419 | function getUserStylesheet() { |
| 420 | | - global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage, $wgStyleVersion; |
| | 420 | + global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage, $wgStyleVersion, $wgOut; |
| 421 | 421 | $sheet = $this->getStylesheet(); |
| 422 | 422 | $s = "@import \"$wgStylePath/common/shared.css?$wgStyleVersion\";\n"; |
| 423 | 423 | $s .= "@import \"$wgStylePath/common/oldshared.css?$wgStyleVersion\";\n"; |
| — | — | @@ -428,6 +428,7 @@ |
| 429 | 429 | '@import "' . self::makeNSUrl( ucfirst( $this->getSkinName() . '.css' ), $query, NS_MEDIAWIKI ) . "\";\n"; |
| 430 | 430 | |
| 431 | 431 | $s .= $this->doGetUserStyles(); |
| | 432 | + if($wgOut->isPrintable()) $s .= '@import "' . self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI ) . "\";\n"; |
| 432 | 433 | return $s."\n"; |
| 433 | 434 | } |
| 434 | 435 | |
| — | — | @@ -528,7 +529,7 @@ |
| 529 | 530 | } |
| 530 | 531 | return $s; |
| 531 | 532 | } |
| 532 | | - |
| | 533 | + |
| 533 | 534 | function getBodyOptions() { |
| 534 | 535 | global $wgUser, $wgTitle, $wgOut, $wgRequest, $wgContLang; |
| 535 | 536 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -155,6 +155,7 @@ |
| 156 | 156 | external links. |
| 157 | 157 | * (bug 14132) Allow user to disable bot edits from being output to UDP. |
| 158 | 158 | * (bug 14328) jsMsg() within Wikibits now accepts a DOM object, not just a string |
| | 159 | +* (bug 2889) MediaWiki:Print.css applies to the printable version |
| 159 | 160 | |
| 160 | 161 | === Bug fixes in 1.13 === |
| 161 | 162 | |