Browse Source

Sync with 1.4.x wherein REQUEST_URI isn't always trustable under some PHP versions for use as our PHP_SELF variable value

pdontthink 16 years ago
parent
commit
03b26f2c81
1 changed files with 5 additions and 3 deletions
  1. 5 3
      functions/global.php

+ 5 - 3
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) ) {