dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add MediaWiki:Print.css back in. Now applies to printable=yes -and- actual printing...
[lhc/web/wiklou.git]
/
includes
/
Skin.php
diff --git
a/includes/Skin.php
b/includes/Skin.php
index
3f8c6b9
..
86c8c05
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() {
# 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";
$sheet = $this->getStylesheet();
$s = "@import \"$wgStylePath/common/shared.css?$wgStyleVersion\";\n";
$s .= "@import \"$wgStylePath/common/oldshared.css?$wgStyleVersion\";\n";
@@
-428,6
+428,8
@@
class Skin extends Linker {
'@import "' . self::makeNSUrl( ucfirst( $this->getSkinName() . '.css' ), $query, NS_MEDIAWIKI ) . "\";\n";
$s .= $this->doGetUserStyles();
'@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";
+ else $s .= '@import "' . self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI ) . "\" print;\n";
return $s."\n";
}
return $s."\n";
}