Wordpress 3.2.1

[autoinstalls/wordpress.git] / wp-includes / vars.php

diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index bfd2a5d3332ceda2d7a4f01c659b9eb0d81c6df5..aca78f1f63ba33d00d1bee0cbdcf8c03dad040ad 100644 (file)
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -47,7 +47,13 @@ if ( isset($_SERVER['HTTP_USER_AGENT']) ) {
        if ( strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false ) {
                $is_lynx = true;
        } elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'chrome') !== false ) {
-               $is_chrome = true;
+               if ( stripos( $_SERVER['HTTP_USER_AGENT'], 'chromeframe' ) !== false ) {
+                       if ( $is_chrome = apply_filters( 'use_google_chrome_frame', is_admin() ) )
+                               header( 'X-UA-Compatible: chrome=1' );
+                       $is_winIE = ! $is_chrome;
+               } else {
+                       $is_chrome = true;
+               }
        } elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false ) {
                $is_safari = true;
        } elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false ) {