Ticket #18987: 18987.patch

wp-includes/load.php

@@ -51 +51 @@
         // Fix for IIS when running with PHP ISAPI
         if ( empty( $_SERVER['REQUEST_URI'] ) || ( php_sapi_name() != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
 
+                if ( isset( $_SERVER['UNENCODED_URL'] ) ) {
+                        $_SERVER['REQUEST_URI'] = $_SERVER['UNENCODED_URL'];
+                }
                 // IIS Mod-Rewrite
-                if ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
+                elseif ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
                         $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
                 }
                 // IIS Isapi_Rewrite