Changeset 16905

Timestamp:

12/14/2010 08:35:48 AM (14 years ago)

Author:

dd32

Message:

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

File:

• trunk/wp-includes/vars.php (modified) (2 diffs)

trunk/wp-includes/vars.php

@@ -81 +81 @@
  * @global bool $is_IIS
  */
-$is_IIS = (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer') !== false);
+$is_IIS = !$is_apache && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer') !== false);
 
 /**
@@ -87 +87 @@
  * @global bool $is_iis7
  */
-$is_iis7 = (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/7.') !== false);
-
+$is_iis7 = $is_IIS && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/7.') !== false);
 
 ?>