WordPress.org

Make WordPress Core

Changeset 6208


Ignore:
Timestamp:
10/09/2007 05:38:25 PM (11 years ago)
Author:
markjaquith
Message:

IIS REQUEST_URI-setting fixes from snakefoot. fixes #5160 for trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-settings.php

    r6203 r6208  
    3737        $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
    3838    }
    39     else {
    40         // If root then simulate that no script-name was specified
    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     }
    47         elseif ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
    48             // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
     39    else
     40    {
     41        // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
     42        if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
    4943            $_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
    5044        else
Note: See TracChangeset for help on using the changeset viewer.