Merge branch 'develop' of http://github.com/laravel/laravel into develop/exception
This commit is contained in:
commit
662bde8580
|
@ -34,7 +34,7 @@ class Request {
|
||||||
*/
|
*/
|
||||||
public static function uri()
|
public static function uri()
|
||||||
{
|
{
|
||||||
return URI::get();
|
return URI::current();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -86,6 +86,7 @@ protected static function remove($uri, $value)
|
||||||
{
|
{
|
||||||
return substr($uri, strlen($value));
|
return substr($uri, strlen($value));
|
||||||
}
|
}
|
||||||
|
return $uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue