WordPress.org

Make WordPress Core

Changeset 16905


Ignore:
Timestamp:
12/14/2010 08:35:48 AM (9 years ago)
Author:
dd32
Message:

Other piece of r16904. Limit variable string searching when possible. See #10187

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/vars.php

    r15747 r16905  
    8181 * @global bool $is_IIS
    8282 */
    83 $is_IIS = (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer') !== false);
     83$is_IIS = !$is_apache && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer') !== false);
    8484
    8585/**
     
    8787 * @global bool $is_iis7
    8888 */
    89 $is_iis7 = (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/7.') !== false);
    90 
     89$is_iis7 = $is_IIS && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/7.') !== false);
    9190
    9291?>
Note: See TracChangeset for help on using the changeset viewer.