Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.136
diff -u -p -r1.136 bootstrap.inc
--- includes/bootstrap.inc	8 Dec 2006 12:09:54 -0000	1.136
+++ includes/bootstrap.inc	8 Dec 2006 22:55:21 -0000
@@ -562,7 +562,7 @@ function request_uri() {
   static $uri;
   if (!isset($uri)) {
     // If we have a REQUEST_URI and the query string is present in it, we use the value directly.
-    if (isset($_SERVER['REQUEST_URI']) && !empty($_SERVER['QUERY_STRING']) && strpos($_SERVER['REQUEST_URI'], $_SERVER['QUERY_STRING'])) {
+    if (isset($_SERVER['REQUEST_URI']) && !empty($_SERVER['QUERY_STRING']) && strpos($_SERVER['REQUEST_URI'], $_GET['q'])) {
       $uri = $_SERVER['REQUEST_URI'];
     }
     else {