- Fixed a IIS bug with regard to register globals. This also avoids the

  aforementioned ugly hack.  Patch by Moshe.

1 files changed, 5 insertions, 2 deletions

diff --git a/includes/common.inc b/includes/common.inc
index 964e14362..82a45b0f5 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -98,13 +98,16 @@ function object2array($node) {
 }
 
 function request_uri() {
-  // since request_uri() is only available on apache, we generate equivalent using other environment vars.
+  /*
+  ** Since request_uri() is only available on Apache, we generate
+  ** equivalent using other environment vars.
+  */
 
   if (isset($_SERVER["REQUEST_URI"])) {
     return $_SERVER["REQUEST_URI"];
   }
   else {
-    return $_SERVER["PATH_INFO"] ."?". $_SERVER["QUERY_STRING"];
+    return $_SERVER["PHP_SELF"] ."?". $_SERVER["QUERY_STRING"];
   }
 }