From: Tom Gilder <tomgilder@users.mediawiki.org>
Date: Tue, 18 Jan 2005 00:05:35 +0000 (+0000)
Subject: Conditional comments IE6 fix; remove old PNG fix
X-Git-Tag: 1.5.0alpha1~903
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=789f8a08b853669b1c290731658a21332dcc64f4;p=lhc%2Fweb%2Fwiklou.git

Conditional comments IE6 fix; remove old PNG fix
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 93dc544852..a9ce24ffad 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -806,9 +806,7 @@ class OutputPage {
 			$link = $wgRequest->escapeAppendQuery( 'feed=atom' );
 			$ret .= "<link rel='alternate' type='application/rss+atom' title='Atom 0.3' href='$link' />\n";
 		}
-		# FIXME: get these working
-		# $fix = htmlspecialchars( $wgStylePath . "/ie-png-fix.js" );
-		# $ret .= "<!--[if gte IE 5.5000]><script type='text/javascript' src='$fix'>< /script><![endif]-->";
+
 		return $ret;
 	}
 	
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 18363933dc..ca6f2fd574 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -51,7 +51,7 @@ class MonoBookTemplate extends QuickTemplate {
     <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css"; /*]]>*/</style>
     <link rel="stylesheet" type="text/css" media="print" href="<?php $this->text('stylepath') ?>/common/commonPrint.css" />
     <!--[if lt IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE50Fixes.css";</style><![endif]-->
-    <!--[if gte IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE55Fixes.css";</style><![endif]-->
+    <!--[if IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE55Fixes.css";</style><![endif]-->
     <!--[if IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css";</style><![endif]-->
     <!--[if IE]><script type="text/javascript" src="<?php $this->text('stylepath') ?>/common/IEFixes.js"></script>
     <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
diff --git a/skins/disabled/MonoBook.pt b/skins/disabled/MonoBook.pt
index 19c9aeeac6..2bb67eb755 100644
--- a/skins/disabled/MonoBook.pt
+++ b/skins/disabled/MonoBook.pt
@@ -7,7 +7,7 @@
     <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "${stylepath}/${stylename}/main.css"; /*]]>*/</style>
     <link rel="stylesheet" type="text/css" media="print" href="${stylepath}/common/commonPrint.css" />
     <!--[if lt IE 5.5000]><style type="text/css"> @import "${stylepath}/${stylename}/IE50Fixes.css"; </style><![endif]-->
-    <!--[if gte IE 5.5000]><style type="text/css"> @import "${stylepath}/${stylename}/IE55Fixes.css"; </style><![endif]-->
+    <!--[if IE 5.5000]><style type="text/css"> @import "${stylepath}/${stylename}/IE55Fixes.css"; </style><![endif]-->
     <!--[if IE 6]><style type="text/css"> @import "${stylepath}/${stylename}/IE60Fixes.css"; </style><![endif]-->
     <!--[if IE]><script type="text/javascript" src="${stylepath}/common/IEFixes.js"></script>
     <meta http-equiv="imagetoolbar" content="no" /><![endif]-->