From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Thu, 10 Jun 2004 19:56:32 +0000 (+0000)
Subject: no css for IE4
X-Git-Tag: 1.5.0alpha1~2937
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=c6b81f31f819fa3f9544a219f3cc8f511fd96bd1;p=lhc%2Fweb%2Fwiklou.git

no css for IE4
---

diff --git a/includes/Skin.php b/includes/Skin.php
index 7686523e92..1ac1d97e2f 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -170,14 +170,14 @@ class Skin {
 		global $wgOut, $wgStylePath, $wgLang, $wgUser, $wgRequest, $wgTitle;
 		$sheet = $this->getStylesheet();
 		$action = $wgRequest->getText('action');
-		$s = "@import url(\"$wgStylePath/$sheet\");\n";
-		if($wgLang->isRTL()) $s .= "@import url(\"$wgStylePath/common_rtl.css\");\n";
+		$s = "@import \"$wgStylePath/$sheet\";\n";
+		if($wgLang->isRTL()) $s .= "@import \"$wgStylePath/common_rtl.css\";\n";
 		if( $wgUser->getID() != 0 ) { # logged in	
 			if($wgTitle->isCssSubpage() and $action == 'submit' and  $wgTitle->userCanEditCssJsSubpage()) {
 				$s .= $wgRequest->getText('wpTextbox1');
 			} else {
 				$userpage = $wgLang->getNsText( Namespace::getUser() ) . ":" . $wgUser->getName();
-				$s.= '@import url("'.$this->makeUrl($userpage.'/'.$this->getSkinName(), 'action=raw&ctype=text/css').'");'."\n";
+				$s.= '@import "'.$this->makeUrl($userpage.'/'.$this->getSkinName(), 'action=raw&ctype=text/css').'";'."\n";
 			}
 		}
 		$s .= $this->doGetUserStyles();
diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php
index 44f3c9ada8..c8c6ec9ffe 100644
--- a/includes/SkinPHPTal.php
+++ b/includes/SkinPHPTal.php
@@ -516,20 +516,20 @@
 			global $wgRequest, $wgTitle;
 			$action = $wgRequest->getText('action');
 			# generated css
-			$this->usercss = '@import url('.$this->makeUrl('-','action=raw&gen=css').');'."\n";
+			$this->usercss = '@import "'.$this->makeUrl('-','action=raw&gen=css').'";'."\n";
 			
 			if( $this->loggedin ) {
 				if($wgTitle->isCssSubpage() and $action == 'submit' and  $wgTitle->userCanEditCssJsSubpage()) {
 					# generated css
-					$this->usercss = '@import url('.$this->makeUrl('-','action=raw&gen=css&smaxage=0&maxage=0').');'."\n";
+					$this->usercss = '@import "'.$this->makeUrl('-','action=raw&gen=css&smaxage=0&maxage=0').');'."\n";
 					// css preview
 					$this->usercss .= $wgRequest->getText('wpTextbox1');
 				} else {
 					# generated css
-					$this->usercss .= '@import url('.$this->makeUrl('-','action=raw&gen=css&smaxage=0').');'."\n";
+					$this->usercss .= '@import "'.$this->makeUrl('-','action=raw&gen=css&smaxage=0').'";'."\n";
 					# import user stylesheet
-					$this->usercss .= '@import url('.
-					$this->makeUrl($this->userpage.'/'.$this->skinname.'.css', 'action=raw&ctype=text/css').');'."\n";
+					$this->usercss .= '@import "'.
+					$this->makeUrl($this->userpage.'/'.$this->skinname.'.css', 'action=raw&ctype=text/css').'";'."\n";
 				}
 				if($wgTitle->isJsSubpage() and $action == 'submit' and  $wgTitle->userCanEditCssJsSubpage()) {
 					# XXX: additional security check/prompt?
@@ -545,9 +545,9 @@
 			$action = $wgRequest->getText('action');
 			$maxage = $wgRequest->getText('maxage');
 			$s = "/* generated user stylesheet */\n";
-			if($wgLang->isRTL()) $s .= '@import url('.$wgStylePath.'/'.$this->skinname.'/rtl.css);'."\n";
-			$s .= '@import url('.
-			$this->makeNSUrl(ucfirst($this->skinname).'.css', 'action=raw&ctype=text/css&smaxage='.$wgSquidMaxage, NS_MEDIAWIKI).');'."\n";
+			if($wgLang->isRTL()) $s .= '@import "'.$wgStylePath.'/'.$this->skinname.'/rtl.css";'."\n";
+			$s .= '@import "'.
+			$this->makeNSUrl(ucfirst($this->skinname).'.css', 'action=raw&ctype=text/css&smaxage='.$wgSquidMaxage, NS_MEDIAWIKI)."\";\n";
 			if($wgUser->getID() != 0) {
 				if ( 1 == $wgUser->getOption( "underline" ) ) {
 					$s .= "a { text-decoration: underline; }\n";