From 59b696f0f2eaaf90fb2949179cd6f14d616854d7 Mon Sep 17 00:00:00 2001
From: Tim Snadden <tim@snadden.com>
Date: Tue, 6 May 2014 07:54:59 +1200
Subject: [PATCH] Simplify .htaccess

The request can be captured in the RewriteRule, removing need for it to be captured in it's own RewriteCond.
---
 .htaccess | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.htaccess b/.htaccess
index 683ba0b..cbb5bda 100644
--- a/.htaccess
+++ b/.htaccess
@@ -28,10 +28,9 @@ ErrorDocument 500 /assets/error-500.html
 	RewriteRule silverstripe-cache(/|$) - [F,L,NC]
 	RewriteRule composer\.(json|lock) - [F,L,NC]
 
-	RewriteCond %{REQUEST_URI} ^(.*)$
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_URI} !\.php$
-	RewriteRule .* framework/main.php?url=%1 [QSA]
+	RewriteRule (.*) framework/main.php?url=$1 [QSA]
 
 	RewriteCond %{REQUEST_URI} ^(.*)/framework/main.php$
 	RewriteCond %{REQUEST_FILENAME} !-f