Changeset 2426 for trunk/htdocs/system/classes/site.php

Timestamp:

09/01/08 15:49:44 (4 months ago)

Author:

moeffju

Message:

Site::script_name() was using SCRIPT_URL which is not always set, and if it is, is set to the 'wrong' URL (before rewriting).
The correct data is in SCRIPT_NAME and PHP_SELF.

Files:

• trunk/htdocs/system/classes/site.php (modified) (1 diff)

trunk/htdocs/system/classes/site.php

@@ -47 +47 @@
         case isset ( $scriptname ):
             break;
-        case isset( $_SERVER['SCRIPT_URL'] ):
-            $scriptname= $_SERVER['SCRIPT_URL'];
-            break;
         case isset( $_SERVER['SCRIPT_NAME'] ):
             $scriptname= $_SERVER['SCRIPT_NAME'];
+            break;
+        case isset( $_SERVER['PHP_SELF'] ):
+            $scriptname= $_SERVER['PHP_SELF'];
             break;
         default: