2007-06-08 Mark Rowe <mrowe@apple.com>

        Rubber-stamped by Hyatt.

        Switch to using Internet Explorer's conditional comments to target IE-specific styles rather
        than doing server-side user agent checks.  This resolves an issue some people were seeing where
        caching would lead to a page generated for an Internet Explorer user being served to a Safari
        user.  The visible symptom of this was many of the graphics were missing.

        * blog/wp-content/themes/webkit/header.php:
        * header.inc:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@22064 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitSite/ChangeLog b/WebKitSite/ChangeLog
index 0514d7739fed1b9a3af291180997f03582dd2481..b39120d957e5e08590e0379aaf26ddea27667f20 100644 (file)
--- a/WebKitSite/ChangeLog
+++ b/WebKitSite/ChangeLog
@@ -1,3 +1,15 @@
+2007-06-08  Mark Rowe  <mrowe@apple.com>
+
+        Rubber-stamped by Hyatt.
+
+        Switch to using Internet Explorer's conditional comments to target IE-specific styles rather
+        than doing server-side user agent checks.  This resolves an issue some people were seeing where
+        caching would lead to a page generated for an Internet Explorer user being served to a Safari
+        user.  The visible symptom of this was many of the graphics were missing.
+
+        * blog/wp-content/themes/webkit/header.php:
+        * header.inc:
+

 2007-05-04  Mark Rowe  <mrowe@apple.com>
 
         Upgrade to WordPress 2.2.  I didn't go to the effort of tracking down files
 2007-05-04  Mark Rowe  <mrowe@apple.com>
 
         Upgrade to WordPress 2.2.  I didn't go to the effort of tracking down files

diff --git a/WebKitSite/blog/wp-content/themes/webkit/header.php b/WebKitSite/blog/wp-content/themes/webkit/header.php
index 1c16e2d2079c3fec0512ef0182cf82bdfdc6808a..4dce457cf26a834db09b4026dc37387d560615af 100644 (file)
--- a/WebKitSite/blog/wp-content/themes/webkit/header.php
+++ b/WebKitSite/blog/wp-content/themes/webkit/header.php
@@ -11,19 +11,15 @@
     <link rel="stylesheet" type="text/css" href="/css/green.css" title="green">
     <link rel="stylesheet" type="text/css" href="<?php bloginfo('stylesheet_url'); ?>">
 
     <link rel="stylesheet" type="text/css" href="/css/green.css" title="green">
     <link rel="stylesheet" type="text/css" href="<?php bloginfo('stylesheet_url'); ?>">
 

-<?php
-    $msie = '/msie\s(5\.[5-9]|[6]\.[0-9]*).*(win)/i';
-    $agent = $_SERVER['HTTP_USER_AGENT'];
-    if( isset($agent) && preg_match($msie, $agent) && ! preg_match('/opera/i', $agent)) {
-?>
-    <link rel="stylesheet" type="text/css" href="/css/ie.css">
-<?php } else { ?>

     <link rel="alternate stylesheet" type="text/css" href="/css/blue.css" title="blue">
     <link rel="alternate stylesheet" type="text/css" href="/css/yellow.css" title="yellow">
     <link rel="alternate stylesheet" type="text/css" href="/css/pink.css" title="pink">
     <link rel="alternate stylesheet" type="text/css" href="/css/purple.css" title="purple">
     <link rel="alternate stylesheet" type="text/css" href="/css/gray.css" title="gray">
     <link rel="alternate stylesheet" type="text/css" href="/css/blue.css" title="blue">
     <link rel="alternate stylesheet" type="text/css" href="/css/yellow.css" title="yellow">
     <link rel="alternate stylesheet" type="text/css" href="/css/pink.css" title="pink">
     <link rel="alternate stylesheet" type="text/css" href="/css/purple.css" title="purple">
     <link rel="alternate stylesheet" type="text/css" href="/css/gray.css" title="gray">

-<?php } ?>
+
+<!--[if gte IE 5]>
+    <link rel="stylesheet" type="text/css" href="/css/ie.css">
+<![endif]-->

 
     <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php bloginfo('rss2_url'); ?>">
     <link rel="alternate" type="text/xml" title="RSS .92" href="<?php bloginfo('rss_url'); ?>">
 
     <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php bloginfo('rss2_url'); ?>">
     <link rel="alternate" type="text/xml" title="RSS .92" href="<?php bloginfo('rss_url'); ?>">


@@ -40,4 +36,4 @@
 
 <div id="icon"></div>
 
 
 <div id="icon"></div>
 

-<div id="content">
\ No newline at end of file
+<div id="content">

diff --git a/WebKitSite/header.inc b/WebKitSite/header.inc
index 0dc2d9e84e35ca0ec34b50e70be1ceaec1181b9d..2dcbe0e9c1e53ae95232dad784215cb265378dca 100644 (file)
--- a/WebKitSite/header.inc
+++ b/WebKitSite/header.inc
@@ -8,19 +8,15 @@
     <link rel="stylesheet" type="text/css" href="/css/main.css">
     <link rel="stylesheet" type="text/css" href="/css/green.css" title="green">
 
     <link rel="stylesheet" type="text/css" href="/css/main.css">
     <link rel="stylesheet" type="text/css" href="/css/green.css" title="green">
 

-<?php
-    $msie = '/msie\s(5\.[5-9]|[6]\.[0-9]*).*(win)/i';
-    $agent = $_SERVER['HTTP_USER_AGENT'];
-    if( isset($agent) && preg_match($msie, $agent) && ! preg_match('/opera/i', $agent)) {
-?>
-    <link rel="stylesheet" type="text/css" href="/css/ie.css">
-<?php } else { ?>

     <link rel="alternate stylesheet" type="text/css" href="/css/blue.css" title="blue">
     <link rel="alternate stylesheet" type="text/css" href="/css/yellow.css" title="yellow">
     <link rel="alternate stylesheet" type="text/css" href="/css/pink.css" title="pink">
     <link rel="alternate stylesheet" type="text/css" href="/css/purple.css" title="purple">
     <link rel="alternate stylesheet" type="text/css" href="/css/gray.css" title="gray">
     <link rel="alternate stylesheet" type="text/css" href="/css/blue.css" title="blue">
     <link rel="alternate stylesheet" type="text/css" href="/css/yellow.css" title="yellow">
     <link rel="alternate stylesheet" type="text/css" href="/css/pink.css" title="pink">
     <link rel="alternate stylesheet" type="text/css" href="/css/purple.css" title="purple">
     <link rel="alternate stylesheet" type="text/css" href="/css/gray.css" title="gray">

-<?php } ?>
+
+<!--[if gte IE 5]>
+    <link rel="stylesheet" type="text/css" href="/css/ie.css">
+<![endif]-->

 
     <script type="text/javascript">
         pic1 = new Image(8,9);
 
     <script type="text/javascript">
         pic1 = new Image(8,9);


@@ -49,4 +45,4 @@
 
 <div id="icon"></div>
 
 
 <div id="icon"></div>
 

-<div id="content">
\ No newline at end of file
+<div id="content">