From 6b5a944ab0e1aa55eb4dcd81254ac613a310fff6 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 19 Jun 2008 18:18:57 +0000
Subject: [PATCH] Revert r36308 "(bug 2889) MediaWiki:Print.css now applies to
 the printable version" Doesn't actually work -- it applies it to
 'printable=yes' print simulation, but not to actual printable stylesheet.

---
 RELEASE-NOTES             | 1 -
 includes/Skin.php         | 5 ++---
 includes/SkinTemplate.php | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7584c07b36..ae980676a7 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -157,7 +157,6 @@ 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 14558) New system message (emailuserfooter) is now added to the footer of 
   e-mails sent with Special:Emailuser
 * Add support for Hijri (Islamic) calendar
diff --git a/includes/Skin.php b/includes/Skin.php
index a406c979e2..3f8c6b983f 100644
--- 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, $wgOut;
+		global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage, $wgStyleVersion;
 		$sheet = $this->getStylesheet();
 		$s = "@import \"$wgStylePath/common/shared.css?$wgStyleVersion\";\n";
 		$s .= "@import \"$wgStylePath/common/oldshared.css?$wgStyleVersion\";\n";
@@ -428,7 +428,6 @@ 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";
 	}
 
@@ -529,7 +528,7 @@ END;
 		}
 		return $s;
 	}
-	
+
 	function getBodyOptions() {
 		global $wgUser, $wgTitle, $wgOut, $wgRequest, $wgContLang;
 
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 187d9a8409..c60cfb4e7b 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -962,8 +962,7 @@ class SkinTemplate extends Skin {
 	function setupUserCss() {
 		wfProfileIn( __METHOD__ );
 
-		global $wgRequest, $wgAllowUserCss, $wgUseSiteCss, 
-			$wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser, $wgOut;
+		global $wgRequest, $wgAllowUserCss, $wgUseSiteCss, $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser;
 
 		$sitecss = '';
 		$usercss = '';
@@ -1006,7 +1005,6 @@ 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.
-- 
2.20.1