WordPress.org

Make WordPress Core

Ticket #5160: wp-settings.php.diff

File wp-settings.php.diff, 898 bytes (added by brh, 11 years ago)

Patch against trunk (rev. 6201) to resolve this issue.

  • wp-settings.php

     
    3838        }
    3939        else {
    4040                // If root then simulate that no script-name was specified
    41                 if (empty($_SERVER['PATH_INFO']))
    42                         $_SERVER['REQUEST_URI'] = substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/')) . '/';
     41                if (empty($_SERVER['PATH_INFO'])) {
     42                        if (isset($_SERVER['ORIG_PATH_INFO']))
     43                                $_SERVER['REQUEST_URI'] = $_SERVER['ORIG_PATH_INFO'];
     44                        else
     45                                $_SERVER['REQUEST_URI'] = substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/')) . '/';
     46    }
    4347                elseif ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
    4448                        // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
    4549                        $_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];