Merge branch 'develop' of http://github.com/laravel/laravel into develop/exception

This commit is contained in:
Phill Sparks 2011-11-15 12:53:48 +00:00
commit 662bde8580
2 changed files with 2 additions and 1 deletions

View File

@ -34,7 +34,7 @@ class Request {
*/ */
public static function uri() public static function uri()
{ {
return URI::get(); return URI::current();
} }
/** /**

View File

@ -86,6 +86,7 @@ protected static function remove($uri, $value)
{ {
return substr($uri, strlen($value)); return substr($uri, strlen($value));
} }
return $uri;
} }
/** /**