Changeset 3991

Show
Ignore:
Timestamp:
07/06/06 00:08:53 (2 years ago)
Author:
ryan
Message:

Use HTTP_USER_AGENT from _SERVER.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/2.0/wp-includes/vars.php

    r3911 r3991  
    1515// Simple browser detection 
    1616$is_lynx = 0; $is_gecko = 0; $is_winIE = 0; $is_macIE = 0; $is_opera = 0; $is_NS4 = 0; 
    17 if (!isset($HTTP_USER_AGENT)) { 
    18     $HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT']; 
    19 
    20 if (preg_match('/Lynx/', $HTTP_USER_AGENT)) { 
     17 
     18if (preg_match('/Lynx/', $_SERVER['HTTP_USER_AGENT'])) { 
    2119    $is_lynx = 1; 
    22 } elseif (preg_match('/Gecko/', $HTTP_USER_AGENT)) { 
     20} elseif (preg_match('/Gecko/', $_SERVER['HTTP_USER_AGENT'])) { 
    2321    $is_gecko = 1; 
    24 } elseif ((preg_match('/MSIE/', $HTTP_USER_AGENT)) && (preg_match('/Win/', $HTTP_USER_AGENT))) { 
     22} elseif ((preg_match('/MSIE/', $_SERVER['HTTP_USER_AGENT'])) && (preg_match('/Win/', $_SERVER['HTTP_USER_AGENT']))) { 
    2523    $is_winIE = 1; 
    26 } elseif ((preg_match('/MSIE/', $HTTP_USER_AGENT)) && (preg_match('/Mac/', $HTTP_USER_AGENT))) { 
     24} elseif ((preg_match('/MSIE/', $_SERVER['HTTP_USER_AGENT'])) && (preg_match('/Mac/', $_SERVER['HTTP_USER_AGENT']))) { 
    2725    $is_macIE = 1; 
    28 } elseif (preg_match('/Opera/', $HTTP_USER_AGENT)) { 
     26} elseif (preg_match('/Opera/', $_SERVER['HTTP_USER_AGENT'])) { 
    2927    $is_opera = 1; 
    30 } elseif ((preg_match('/Nav/', $HTTP_USER_AGENT) ) || (preg_match('/Mozilla\/4\./', $HTTP_USER_AGENT))) { 
     28} elseif ((preg_match('/Nav/', $_SERVER['HTTP_USER_AGENT']) ) || (preg_match('/Mozilla\/4\./', $_SERVER['HTTP_USER_AGENT']))) { 
    3129    $is_NS4 = 1; 
    3230} 
  • branches/2.0/wp-settings.php

    r3903 r3991  
    1919unregister_GLOBALS();  
    2020 
    21 $HTTP_USER_AGENT = getenv('HTTP_USER_AGENT'); 
    2221unset( $wp_filter, $cache_userdata, $cache_lastcommentmodified, $cache_lastpostdate, $cache_settings, $category_cache, $cache_categories ); 
    2322