Wordpress 3.1

[autoinstalls/wordpress.git] / wp-includes / vars.php

diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index 7a62c892ad0553e05a6509eecf4c30a06ae72a1a..bfd2a5d3332ceda2d7a4f01c659b9eb0d81c6df5 100644 (file)
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -15,7 +15,12 @@
 // On which page are we ?
 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, '/');
        $pagenow = preg_replace('#\?.*?$#', '', $pagenow);
@@ -33,6 +38,7 @@ if ( is_admin() ) {
        else
                $pagenow = 'index.php';
 }
+unset($self_matches);
 
 // Simple browser detection
 $is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = $is_safari = $is_chrome = $is_iphone = false;
@@ -74,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