Wordpress 3.3

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

diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index aca78f1f63ba33d00d1bee0cbdcf8c03dad040ad..3b824a959ab23881468d76c74c2676915df3e136 100644 (file)
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -12,15 +12,19 @@
  * @package WordPress
  */
 
+global $pagenow,
+       $is_lynx, $is_gecko, $is_winIE, $is_macIE, $is_opera, $is_NS4, $is_safari, $is_chrome, $is_iphone, $is_IE,
+       $is_apache, $is_IIS, $is_iis7;
+
 // On which page are we ?
 if ( is_admin() ) {
        // wp-admin pages are checked more carefully
        if ( is_network_admin() )
-               preg_match('#/wp-admin/network/?(.*?)$#i', $PHP_SELF, $self_matches);
+               preg_match('#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
        elseif ( is_user_admin() )
-               preg_match('#/wp-admin/user/?(.*?)$#i', $PHP_SELF, $self_matches);
+               preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
        else
-               preg_match('#/wp-admin/?(.*?)$#i', $PHP_SELF, $self_matches);
+               preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
        $pagenow = $self_matches[1];
        $pagenow = trim($pagenow, '/');
        $pagenow = preg_replace('#\?.*?$#', '', $pagenow);
@@ -33,7 +37,7 @@ if ( is_admin() ) {
                        $pagenow .= '.php'; // for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
        }
 } else {
-       if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $PHP_SELF, $self_matches) )
+       if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches) )
                $pagenow = strtolower($self_matches[1]);
        else
                $pagenow = 'index.php';
@@ -94,4 +98,4 @@ $is_IIS = !$is_apache && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !
  */
 $is_iis7 = $is_IIS && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/7.') !== false);
 
-?>
\ No newline at end of file
+?>