From d92c298178869f09e6e59c396867b898acb874fa Mon Sep 17 00:00:00 2001 From: rMalie Date: Mon, 13 Feb 2012 16:56:28 +0000 Subject: [PATCH] // Fix redirection to index when friendly url are activated #PSFV-488 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13270 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Dispatcher.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php index 85bb8d3b5..4c31d1e11 100644 --- a/classes/Dispatcher.php +++ b/classes/Dispatcher.php @@ -545,8 +545,10 @@ class DispatcherCore else if (isset($_POST['controller'])) $_POST[$m[2]] = $m[3]; } + if (!Validate::isControllerName($controller)) $controller = false; + // Use routes ? (for url rewriting) if ($this->use_routes && !$controller) { @@ -576,7 +578,7 @@ class DispatcherCore break; } - if ($controller == 'index') + if ($controller == 'index' || $this->request_uri == '/index.php') $controller = $this->default_controller; $this->controller = $controller; }