Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweaked uri determination.

This commit is contained in:
Taylor Otwell 2011-06-28 20:11:05 -05:00
parent e452bbdf3a
commit cd903fc0ce
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
system/request.php
View File

@ -53,7 +53,7 @@ public static function uri()
} }
// ------------------------------------------------------- // -------------------------------------------------------
// Remove the application URL and any extra slashes. // Remove the application URL.
// ------------------------------------------------------- // -------------------------------------------------------
$base_url = parse_url(Config::get('application.url'), PHP_URL_PATH); $base_url = parse_url(Config::get('application.url'), PHP_URL_PATH);
@ -62,18 +62,18 @@ public static function uri()
$uri = (string) substr($uri, strlen($base_url)); $uri = (string) substr($uri, strlen($base_url));
} }
$uri = trim($uri, '/');
// ------------------------------------------------------- // -------------------------------------------------------
// Remove the application index. // Remove the application index and any extra slashes.
// ------------------------------------------------------- // -------------------------------------------------------
$index = Config::get('application.index'); $index = Config::get('application.index');
if (strpos($uri, $index) === 0) if (strpos($uri, '/'.$index) === 0)
{ {
$uri = (string) substr($uri, strlen($index)); $uri = (string) substr($uri, strlen('/'.$index));
} }
$uri = trim($uri, '/');
// ------------------------------------------------------- // -------------------------------------------------------
// If the requests is to the root of the application, we // If the requests is to the root of the application, we
// always return a single forward slash. // always return a single forward slash.