From 24bccbd4676cb8e6b4bcc9c240c97591006bcce5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 24 Feb 2004 07:51:04 +0000
Subject: [PATCH] Keep CSS away from old Netscape, which mucks it up anyway

---
 includes/Skin.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/includes/Skin.php b/includes/Skin.php
index cdf16ef493..f3d0558a97 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -83,9 +83,7 @@ class Skin {
 		wfProfileIn( $fname );
 		
 		$out->addLink( "shortcut icon", "", "/favicon.ico" );
-		if ( $out->isPrintable() ) { $ss = "wikiprintable.css"; }
-		else { $ss = $this->getStylesheet(); }
-		$out->addLink( "stylesheet", "", "{$wgStyleSheetPath}/{$ss}" );
+		
 		wfProfileOut( $fname );
 	}
 	
@@ -126,8 +124,17 @@ class Skin {
 
 	function getUserStyles()
 	{
+		global $wgOut, $wgStyleSheetPath;
+		if( $wgOut->isPrintable() ) {
+			$sheet = "wikiprintable.css";
+		} else {
+			$sheet = $this->getStylesheet();
+		}
 		$s = "<style type='text/css'><!--\n";
+		$s .= "@import url(\"$wgStyleSheetPath/$sheet\");\n";
+		$s .= "@media screen {\n";
 		$s .= $this->doGetUserStyles();
+		$s .= "}\n";
 		$s .= "//--></style>\n";
 		return $s;
 	}
-- 
2.20.1