1 files changed, 7 insertions, 2 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index d0240fa8a..593a4c29f 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -375,9 +375,14 @@ function request_uri() {
     $uri = $_SERVER['REQUEST_URI'];
   }
   else {
-    $uri = $_SERVER['PHP_SELF'] .'?'. $_SERVER['argv'][0];
+    if (isset($_SERVER['argv'])) {
+      $uri = $_SERVER['PHP_SELF'] .'?'. $_SERVER['argv'][0];
+    }
+    else {
+      $uri = $_SERVER['PHP_SELF'] .'?'. $_SERVER['QUERY_STRING'];
+    }
   }
-
+  
   return check_url($uri);
 }