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

662bde85 · Phill Sparks · 58638216 · bdbdd05b · 662bde85 · 662bde85
Commit 662bde85 authored Nov 15, 2011 by Phill Sparks
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

request.php laravel/request.php +1 -1

uri.php laravel/uri.php +1 -0

No files found.
--- a/laravel/request.php
+++ b/laravel/request.php
@@ -34,7 +34,7 @@ class Request {
 	 */
 	public static function uri()
 	{
-		return URI::get();
+		return URI::current();
 	}
 	/**

--- a/laravel/uri.php
+++ b/laravel/uri.php
@@ -86,6 +86,7 @@ class URI {
 		{
 			return substr($uri, strlen($value));
 		}
+		return $uri;
 	}
 	/**