Changeset 1830 for trunk/wp-settings.php

Timestamp:

10/26/2004 04:03:34 AM (21 years ago)

Author:

rboren

Message:

Do not touch REQUEST_URI if it is already set by the server.

File:

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

trunk/wp-settings.php

@@ -5 +5 @@
 
 // Fix for IIS, which doesn't set REQUEST_URI
-$_SERVER['REQUEST_URI'] = (isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : $_SERVER['SCRIPT_NAME']);
-
-// 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'];
+if (! isset($_SERVER['REQUEST_URI'])) {
+    $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'];
+    
+    // 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'];
+    }
 }