Ticket #34634: 34634.diff

src/wp-includes/load.php

@@ -104 +104 @@
 
         // 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( $PHP_SELF ) ) {
+                if ( false === strpos( $_SERVER["REQUEST_URI"], '.php' ) ) {
+                        $_SERVER['PHP_SELF'] = $PHP_SELF = '/index.php';
+                } else {
+                        $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( '/(\?.*)?$/', '', $_SERVER["REQUEST_URI"] );
+                }
+        }
 }
 
 /**