From 91ce6e8b16abb831e1e18b73cf857a257a59e432 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 15 Nov 2012 14:59:14 -0500
Subject: [PATCH] [feature/controller] Turn off URL rewriting by default, add
 comments for usage

PHPBB3-10864
---
 phpBB/.htaccess | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/phpBB/.htaccess b/phpBB/.htaccess
index 68021177f2..1713f8e522 100644
--- a/phpBB/.htaccess
+++ b/phpBB/.htaccess
@@ -1,7 +1,11 @@
 Options +FollowSymLinks
 
 <IfModule mod_rewrite.c>
-RewriteEngine on
+#
+# Uncomment the following line if you will be using any of the URL
+# rewriting below.
+#
+#RewriteEngine on
 
 #
 # Uncomment the statement below if you want to make use of
@@ -10,9 +14,15 @@ RewriteEngine on
 #
 #RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
 
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^(.*)$ app.php [QSA,L]
+#
+# Uncomment the following 3 lines if you want to rewrite URLs passed through
+# the front controller to not use app.php in the actual URL. In other words,
+# an controller that would by default be accessed at /app.php/my/controller
+# can now be accessed at /my/controller directly.
+#
+#RewriteCond %{REQUEST_FILENAME} !-f
+#RewriteCond %{REQUEST_FILENAME} !-d
+#RewriteRule ^(.*)$ app.php [QSA,L]
 </IfModule>
 
 <Files "config.php">