Changes in trunk/wp-includes/vars.php [13132:16905]

File:

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

trunk/wp-includes/vars.php

@@ -16 +16 @@
 if ( is_admin() ) {
     // wp-admin pages are checked more carefully
-    preg_match('#/wp-admin/?(.*?)$#i', $PHP_SELF, $self_matches);
+    if ( is_network_admin() )
+        preg_match('#/wp-admin/network/?(.*?)$#i', $PHP_SELF, $self_matches);
+    elseif ( is_user_admin() )
+        preg_match('#/wp-admin/user/?(.*?)$#i', $PHP_SELF, $self_matches);
+    else
+        preg_match('#/wp-admin/?(.*?)$#i', $PHP_SELF, $self_matches);
     $pagenow = $self_matches[1];
     $pagenow = trim($pagenow, '/');
@@ -34 +39 @@
         $pagenow = 'index.php';
 }
+unset($self_matches);
 
 // Simple browser detection
@@ -75 +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);
 
 /**
@@ -81 +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);
 
 ?>