Changeset 858

Timestamp:

02/10/2004 08:43:23 AM (22 years ago)

Author:

saxmatt

Message:

Work around IIS' lack of REQUEST_URI

File:

• trunk/wp-settings.php (modified) (4 diffs)

trunk/wp-settings.php

@@ -3 +3 @@
 $REMOTE_ADDR = getenv('REMOTE_ADDR'); /* visitor's IP */
 $HTTP_USER_AGENT = getenv('HTTP_USER_AGENT'); /* visitor's browser */
+
+// Fix for IIS, which doesn't set REQUEST_URI
+$_SERVER['REQUEST_URI'] = ( isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : $_SERVER['SCRIPT_NAME'] . (( isset($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : '')));
 
 // Change to E_ALL for development/debugging
@@ -25 +28 @@
 
 $wpdb->hide_errors();
-if (!$wpdb->get_row("SELECT * FROM $tableusers LIMIT 1") && !strstr($HTTP_SERVER_VARS['REQUEST_URI'], 'install.php')) {
+if (!$wpdb->get_row("SELECT * FROM $tableusers LIMIT 1") && !strstr($_SERVER['REQUEST_URI'], 'install.php')) {
     die("It doesn't look like you've installed WP yet. Try running <a href='wp-admin/install.php'>install.php</a>.");
 }
@@ -45 +48 @@
 // get_settings() wherever these are needed OR
 // accessing a single global $all_settings var
-if (!strstr($HTTP_SERVER_VARS['REQUEST_URI'], 'install.php') && !strstr($HTTP_SERVER_VARS['REQUEST_URI'], 'wp-admin/import')) {
+if (!strstr($_SERVER['REQUEST_URI'], 'install.php') && !strstr($_SERVER['REQUEST_URI'], 'wp-admin/import')) {
     $siteurl = get_settings('siteurl');
     // "When trying to design a foolproof system, 
@@ -116 +119 @@
 }
 
+
+
 ?>