Ticket #4853: wp-setting2.diff

wp-settings.php

@@ -41 +41 @@
                 if (empty($_SERVER['PATH_INFO']))
                         $_SERVER['REQUEST_URI'] = substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/')) . '/';
                 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['SCRIPT_NAME'];
+                else
                         $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_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'];