From 99337166eba95d0843d9fb73bbf880bd9dd690e1 Mon Sep 17 00:00:00 2001 From: dd32 Date: Tue, 14 Dec 2010 08:35:48 +0000 Subject: [PATCH] Other piece of r16904. Limit variable string searching when possible. See #10187 git-svn-id: http://svn.automattic.com/wordpress/trunk@16905 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/vars.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/wp-includes/vars.php b/wp-includes/vars.php index 2ac305b95..bfd2a5d33 100644 --- a/wp-includes/vars.php +++ b/wp-includes/vars.php @@ -80,13 +80,12 @@ $is_apache = (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false || strpos( * Whether the server software is IIS or something else * @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); /** * Whether the server software is IIS 7.X * @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); ?> \ No newline at end of file