sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@16905 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2010-12-14 08:35:48 +00:00
parent c6f239ae68
commit d1b78e5309
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/vars.php
View File

@ -80,13 +80,12 @@ $is_apache = (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false || strpos(
* Whether the server software is IIS or something else * Whether the server software is IIS or something else
* @global bool $is_IIS * @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 * Whether the server software is IIS 7.X
* @global bool $is_iis7 * @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);
?> ?>