summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/bootstrap.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index bd076db75..433641755 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -682,9 +682,12 @@ function request_uri() {
if (isset($_SERVER['argv'])) {
$uri = $_SERVER['SCRIPT_NAME'] .'?'. $_SERVER['argv'][0];
}
- else {
+ elseif (isset($_SERVER['QUERY_STRING'])) {
$uri = $_SERVER['SCRIPT_NAME'] .'?'. $_SERVER['QUERY_STRING'];
}
+ else {
+ $uri = $_SERVER['SCRIPT_NAME'];
+ }
}
return $uri;