Ticket #5160: wp-setting3.diff

wp-settings.php

@@ -36 +36 @@
         else if (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
                 $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
         }
-        else
-        {
-                // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
-                if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
-                        $_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
-                else
-                        $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
+        // Simulate REQUEST_URI for IIS
+        else {
+                $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'];
 
+                if (isset($_SERVER['PATH_INFO']) && !empty($_SERVER['PATH_INFO']))
+                {
+                        // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
+                        if ( $_SERVER['PATH_INFO'] !== $_SERVER['SCRIPT_NAME'] )
+                        {
+                                $_SERVER['REQUEST_URI'] .= $_SERVER['PATH_INFO'];
+                        }
+                }
+
                 // Append the query string if it exists and isn't null
                 if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
                         $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];