From 02929f7fbd47abd356324d183a40308ea344401f Mon Sep 17 00:00:00 2001
From: Phill Sparks <me@phills.me.uk>
Date: Tue, 15 Nov 2011 11:30:34 +0000
Subject: [PATCH] Fixed the new URI class

---
 laravel/request.php | 2 +-
 laravel/uri.php     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/laravel/request.php b/laravel/request.php
index 04f27cc4..eb46430e 100644
--- a/laravel/request.php
+++ b/laravel/request.php
@@ -34,7 +34,7 @@ class Request {
 	 */
 	public static function uri()
 	{
-		return URI::get();
+		return URI::current();
 	}
 
 	/**
diff --git a/laravel/uri.php b/laravel/uri.php
index 1cd52a38..08b5624f 100644
--- a/laravel/uri.php
+++ b/laravel/uri.php
@@ -86,6 +86,7 @@ protected static function remove($uri, $value)
 		{
 			return substr($uri, strlen($value));
 		}
+		return $uri;
 	}
 
 	/**