Ticket #17749: 17749.2.diff

wp-includes/load.php

@@ -39 +39 @@
  * @since 3.0.0
  */
 function wp_fix_server_vars() {
-        global $PHP_SELF;
-
         $default_server_values = array(
                 'SERVER_SOFTWARE' => '',
                 'REQUEST_URI' => '',
@@ -87 +85 @@
                 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' ];
 }
 
 /**