Index: bootstrap.inc
===================================================================
--- bootstrap.inc	(revision 170)
+++ bootstrap.inc	(working copy)
@@ -728,23 +728,15 @@
  * generate an equivalent using other environment variables.
  */
 function request_uri() {
-
   if (isset($_SERVER['REQUEST_URI'])) {
-    $uri = $_SERVER['REQUEST_URI'];
+    return $_SERVER['REQUEST_URI'];
+  } elseif (isset($_SERVER['argv'])) {
+    return $_SERVER['SCRIPT_NAME'] .'?'. $_SERVER['argv'][0];
+  } elseif (isset($_SERVER['QUERY_STRING'])) {
+    return $_SERVER['SCRIPT_NAME'] .'?'. $_SERVER['QUERY_STRING'];
+  } else {
+    return $_SERVER['SCRIPT_NAME'];
   }
-  else {
-    if (isset($_SERVER['argv'])) {
-      $uri = $_SERVER['SCRIPT_NAME'] .'?'. $_SERVER['argv'][0];
-    }
-    elseif (isset($_SERVER['QUERY_STRING'])) {
-      $uri = $_SERVER['SCRIPT_NAME'] .'?'. $_SERVER['QUERY_STRING'];
-    }
-    else {
-      $uri = $_SERVER['SCRIPT_NAME'];
-    }
-  }
-
-  return $uri;
 }
 
 /**