Index: bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.173
diff -u -p -r1.173 bootstrap.inc
--- bootstrap.inc	1 Jul 2007 19:49:19 -0000	1.173
+++ bootstrap.inc	6 Jul 2007 17:43:35 -0000
@@ -665,7 +665,12 @@ function request_uri() {
       $uri = $_SERVER['PHP_SELF'] .'?'. $_SERVER['argv'][0];
     }
     else {
-      $uri = $_SERVER['PHP_SELF'] .'?'. $_SERVER['QUERY_STRING'];
+      if (isset($_SERVER['QUERY_STRING'])) {
+        $uri = $_SERVER['PHP_SELF'] .'?'. $_SERVER['QUERY_STRING'];
+      }
+      else {
+	$uri =  $_SERVER['PHP_SELF'];
+      }
     }
   }