Sync with 1.4.x wherein REQUEST_URI isn't always trustable under some PHP versions...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13351 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/global.php b/functions/global.php
index aaf06389a90993594aec5c9006afc6d4a8b41e07..36ee51a58011f14d01512ac8177b22f0adfd712b 100644 (file)
--- a/functions/global.php
+++ b/functions/global.php
@@ -604,9 +604,11 @@ if (!function_exists('session_regenerate_id')) {
  * @since 1.2.3
  */
 function php_self () {
-    if ( sqgetGlobalVar('REQUEST_URI', $req_uri, SQ_SERVER) && !empty($req_uri) ) {
-      return $req_uri;
-    }
+    // PHP 4.4.4 apparently gives the wrong value here - missing the query string
+    // this code is commented out in the 1.4.x code, so we'll do the same here
+    //if ( sqgetGlobalVar('REQUEST_URI', $req_uri, SQ_SERVER) && !empty($req_uri) ) {
+    //  return $req_uri;
+    //}
 
     if ( sqgetGlobalVar('PHP_SELF', $php_self, SQ_SERVER) && !empty($php_self) ) {