ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

continuing to refactor the uri class.

Browse Source
This commit is contained in:
Taylor Otwell
2011-10-24 23:56:17 -05:00
parent e454227d32
commit 415cb0fe12
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
laravel/uri.php
View File

@@ -32,7 +32,8 @@ class URI {
* *
* If the request is to the root of the application, a single forward slash * If the request is to the root of the application, a single forward slash
* will be returned. Otherwise, the URI will be returned with all leading * will be returned. Otherwise, the URI will be returned with all leading
* and trailing slashes removed. * and trailing slashes removed. The application URL and index file will
* also be removed since they are not used when routing the request.
* *
* @return string * @return string
*/ */
@@ -40,18 +41,12 @@ class URI {
{ {
if ( ! is_null($this->uri)) return $this->uri; if ( ! is_null($this->uri)) return $this->uri;
$uri = parse_url($this->server['REQUEST_URI'], PHP_URL_PATH); return $this->uri = $this->format($this->clean(parse_url($this->server['REQUEST_URI'], PHP_URL_PATH)));
return $this->uri = $this->format($this->clean($uri));
} }
/** /**
* Remove extraneous information from the given request URI. * Remove extraneous information from the given request URI.
* *
* The application URL will be removed, as well as the application index file
* and the request format. None of these things are used when routing the
* request to a closure or controller, so they can be safely removed.
*
* @param string $uri * @param string $uri
* @return string * @return string
*/ */