Index: wp-includes/load.php
===================================================================
--- wp-includes/load.php	(revision 18993)
+++ wp-includes/load.php	(working copy)
@@ -39,8 +39,6 @@
  * @since 3.0.0
  */
 function wp_fix_server_vars() {
-	global $PHP_SELF;
-
 	$default_server_values = array(
 		'SERVER_SOFTWARE' => '',
 		'REQUEST_URI' => '',
@@ -87,9 +85,10 @@
 		unset( $_SERVER['PATH_INFO'] );
 
 	// Fix empty PHP_SELF
-	$PHP_SELF = $_SERVER['PHP_SELF'];
-	if ( empty( $PHP_SELF ) )
-		$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( '/(\?.*)?$/', '', $_SERVER["REQUEST_URI"] );
+	if ( empty( $_SERVER['PHP_SELF'] ) )
+		$_SERVER['PHP_SELF'] = preg_replace( '/(\?.*)?$/', '', $_SERVER['REQUEST_URI'] );
+
+	$GLOBALS[ 'PHP_SELF' ] = $_SERVER[ 'PHP_SELF' ];
 }
 
 /**