From 1254a1068fd40cbc73b18232794e2c9e55bce7ea Mon Sep 17 00:00:00 2001 From: mark_story Date: Wed, 14 Mar 2012 20:20:55 -0400 Subject: [PATCH] Fixing issues with unwanted querystring parameters. Because the request url was being appended as ?/$1 any nested named parameters would be added as additional GET params. This is yet another case where named parameters are fail. Modify the built-in htaccess rules to not use a GET parameter at all, and just read from REQUEST_URI. Fixes #2678 --- app/webroot/.htaccess | 2 +- lib/Cake/Console/Templates/skel/webroot/.htaccess | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/webroot/.htaccess b/app/webroot/.htaccess index f2646d170..48a63f014 100644 --- a/app/webroot/.htaccess +++ b/app/webroot/.htaccess @@ -2,5 +2,5 @@ RewriteEngine On RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^(.*)$ index.php?/$1 [QSA,L] + RewriteRule ^(.*)$ index.php [QSA,L] diff --git a/lib/Cake/Console/Templates/skel/webroot/.htaccess b/lib/Cake/Console/Templates/skel/webroot/.htaccess index f2646d170..48a63f014 100644 --- a/lib/Cake/Console/Templates/skel/webroot/.htaccess +++ b/lib/Cake/Console/Templates/skel/webroot/.htaccess @@ -2,5 +2,5 @@ RewriteEngine On RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^(.*)$ index.php?/$1 [QSA,L] + RewriteRule ^(.*)$ index.php [QSA,L]