Changeset 6203

Timestamp:

10/08/2007 08:48:29 PM (19 years ago)

Author:

markjaquith

Message:

Check for ORIG_PATH_INFO on IIS. props brh, fixes #5160

File:

• trunk/wp-settings.php (modified) (1 diff)

trunk/wp-settings.php

@@ -39 +39 @@
         else {
                 // If root then simulate that no script-name was specified
-                if (empty($_SERVER['PATH_INFO']))
-                        $_SERVER['REQUEST_URI'] = substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/')) . '/';
+                if (empty($_SERVER['PATH_INFO'])) {
+                        if (isset($_SERVER['ORIG_PATH_INFO']))
+                                $_SERVER['REQUEST_URI'] = $_SERVER['ORIG_PATH_INFO'];
+                        else
+                                $_SERVER['REQUEST_URI'] = substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/')) . '/';
+    }
                 elseif ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
                         // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)