From b3efcdaaaa24995ffa999d7dba6b2c69ab435140 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Mon, 18 May 2009 14:54:16 +0000 Subject: [PATCH] Recognize Expression Web 2 as IIS. Props peaceablewhale, DD32. fixes #8725 git-svn-id: https://develop.svn.wordpress.org/trunk@11379 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/vars.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-includes/vars.php b/wp-includes/vars.php index 4153658764..232385da64 100644 --- a/wp-includes/vars.php +++ b/wp-includes/vars.php @@ -65,19 +65,19 @@ $is_IE = ( $is_macIE || $is_winIE ); * Whether the server software is Apache or something else * @global bool $is_apache */ -$is_apache = ((strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) || (strpos($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') !== false)) ? true : false; +$is_apache = (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') !== false); /** * Whether the server software is IIS or something else * @global bool $is_IIS */ -$is_IIS = (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false) ? true : false; +$is_IIS = (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 + * @global bool $is_iis7 */ -$is_iis7 = ($is_IIS && strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/7.') !== false) ? true : false; +$is_iis7 = (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/7.') !== false); ?> \ No newline at end of file