From 88ebf6125cb2d384b553dfd50046b727ed825649 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Mon, 8 Aug 2011 09:44:10 -0500
Subject: [PATCH] Refactor the request class.

---
 system/request.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/system/request.php b/system/request.php
index 3ea419a2..a3ddd08b 100644
--- a/system/request.php
+++ b/system/request.php
@@ -29,15 +29,11 @@ public static function uri()
 
 		$uri = static::raw_uri();
 
-		if (strpos($uri, $base = parse_url(Config::get('application.url'), PHP_URL_PATH)) === 0)
-		{
-			$uri = substr($uri, strlen($base));
-		}
+		$base = parse_url(Config::get('application.url'), PHP_URL_PATH);
 
-		if (strpos($uri, $index = '/index.php') === 0)
-		{
-			$uri = substr($uri, strlen($index));
-		}
+		if (strpos($uri, $base) === 0) $uri = substr($uri, strlen($base));
+
+		if (strpos($uri, $index = '/index.php') === 0) $uri = substr($uri, strlen($index));
 
 		return static::$uri = (($uri = trim($uri, '/')) == '') ? '/' : $uri;
 	}