Do not touch REQUEST_URI if it is already set by the server.
git-svn-id: https://develop.svn.wordpress.org/trunk@1830 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
d3f7d9e4c8
commit
9e9a6348f5
@ -4,12 +4,14 @@ $REMOTE_ADDR = getenv('REMOTE_ADDR'); /* visitor's IP */
|
|||||||
$HTTP_USER_AGENT = getenv('HTTP_USER_AGENT'); /* visitor's browser */
|
$HTTP_USER_AGENT = getenv('HTTP_USER_AGENT'); /* visitor's browser */
|
||||||
|
|
||||||
// Fix for IIS, which doesn't set REQUEST_URI
|
// Fix for IIS, which doesn't set REQUEST_URI
|
||||||
$_SERVER['REQUEST_URI'] = (isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : $_SERVER['SCRIPT_NAME']);
|
if (! isset($_SERVER['REQUEST_URI'])) {
|
||||||
|
$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'];
|
||||||
|
|
||||||
// Append the query string if it exists and isn't null
|
// Append the query string if it exists and isn't null
|
||||||
if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
|
if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
|
||||||
$_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
|
$_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if ( !(phpversion() >= '4.1') )
|
if ( !(phpversion() >= '4.1') )
|
||||||
die( 'Your server is running PHP version ' . phpversion() . ' but WordPress requires at least 4.1' );
|
die( 'Your server is running PHP version ' . phpversion() . ' but WordPress requires at least 4.1' );
|
||||||
|
Loading…
x
Reference in New Issue
Block a user