r3638b.patch
Public
Actions

Authored By

	• bzimport
	Nov 21 2014, 8:40 PM

Size

2 KB

Referenced Files

None

Subscribers

None

r3638b.patch
View Options

	Index: includes/SkinTemplate.php
	===================================================================
	--- includes/SkinTemplate.php (revision 36307)
	+++ includes/SkinTemplate.php (revision 36308)
	@@ -962,7 +962,8 @@
	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 @@
	$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())
	+ $media = "";
	+ else
	+ $media = " print";
	+ $s .= '@import "' . self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI ) . "\"$media;\n";
	}

	# If we use any dynamic CSS, make a little CDATA block out of it.
	Index: includes/Skin.php
	===================================================================
	--- includes/Skin.php (revision 36307)
	+++ includes/Skin.php (revision 36308)
	@@ -416,7 +416,7 @@

	# 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 @@
	'@import "' . self::makeNSUrl( ucfirst( $this->getSkinName() . '.css' ), $query, NS_MEDIAWIKI ) . "\";\n";

	$s .= $this->doGetUserStyles();
	+ if($wgOut->isPrintable())
	+ $media = "";
	+ else
	+ $media = " print";
	+ $s .= '@import "' . self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI ) . "\"$media;\n";
	return $s."\n";
	}

	@@ -528,7 +529,7 @@
	}
	return $s;
	}
	-
	+
	function getBodyOptions() {
	global $wgUser, $wgTitle, $wgOut, $wgRequest, $wgContLang;

	Index: RELEASE-NOTES
	===================================================================
	--- RELEASE-NOTES (revision 36307)
	+++ RELEASE-NOTES (revision 36308)
	@@ -155,6 +155,7 @@
	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 ===

File Metadata

Mime Type: text/x-diff
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1735
Default Alt Text: r3638b.patch (2 KB)

r3638b.patchPublicActions

r3638b.patchView Options

File Metadata

Event Timeline

r3638b.patch
Public
Actions

r3638b.patch
View Options