Changeset 1709

Timestamp:

01/13/2008 01:04:05 PM (12 months ago)

Author:

Shadowhand

Message:

Fixing #287, thanks Inquisitus.

Files:

• trunk/system/libraries/Router.php (modified) (1 diff)

trunk/system/libraries/Router.php

@@ -233 +233 @@
                 }
 
-                // Find the URI string based on the location of the front controller
-                if (($offset = strpos(self::$current_uri, KOHANA)) !== FALSE)
-                {
-                        // Add the length of the index file to the offset
-                        $offset += strlen(KOHANA);
-
-                        // Get the segment part of the URL
-                        self::$current_uri = substr(self::$current_uri, $offset);
-                        self::$current_uri = trim(self::$current_uri, '/');
+                // The front controller directory and filename
+                $fc = substr($_SERVER['SCRIPT_FILENAME'], strlen($_SERVER['DOCUMENT_ROOT']));
+
+                if (strpos(self::$current_uri, $fc) === 0)
+                {
+                        // Remove the front controller from the current uri
+                        self::$current_uri = substr(self::$current_uri, strlen($fc));
                 }