From bed3856f2d29648a39868c920ee61f81ce2c185b Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Thu, 8 Sep 2011 23:48:34 +0200 Subject: [PATCH] IIS 7 compatibility --- adminer/include/bootstrap.inc.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php index 4e2a43eb..1413f088 100644 --- a/adminer/include/bootstrap.inc.php +++ b/adminer/include/bootstrap.inc.php @@ -22,8 +22,11 @@ if (isset($_GET["file"])) { include "../adminer/include/functions.inc.php"; global $adminer, $connection, $drivers, $edit_functions, $enum_length, $error, $functions, $grouping, $HTTPS, $inout, $jush, $LANG, $langs, $on_actions, $structured_types, $token, $translations, $types, $unsigned, $VERSION; // allows including Adminer inside a function -if (!isset($_SERVER["REQUEST_URI"])) { - $_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"] . ($_SERVER["QUERY_STRING"] != "" ? "?$_SERVER[QUERY_STRING]" : ""); // IIS 5 compatibility +if (!$_SERVER["REQUEST_URI"]) { // IIS 5 compatibility + $_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"]; +} +if (!strpos($_SERVER["REQUEST_URI"], '?') && $_SERVER["QUERY_STRING"] != "") { // IIS 7 compatibility + $_SERVER["REQUEST_URI"] .= "?$_SERVER[QUERY_STRING]"; } $HTTPS = $_SERVER["HTTPS"] && strcasecmp($_SERVER["HTTPS"], "off");