// Fix 404 redirection in dispatcher

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12268 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 14:28:34 +00:00
parent 8e277e6e17
commit c5eafd327f
1 changed files with 2 additions and 2 deletions
@@ -418,7 +418,7 @@ class DispatcherCore
 			$keywords = $transform_keywords;
 		}

-		$regexp = '#^/'.$regexp.'#u';
+		$regexp = '#^/'.$regexp.'(\?.*)?$#u';
 		$this->routes[$route_id] = array(
 			'rule' =>		$rule,
 			'regexp' =>		$regexp,
@@ -552,7 +552,7 @@ class DispatcherCore
 		{
 			if (!$this->request_uri)
 				return strtolower($this->controller_not_found);
-			$controller = $this->default_controller;
+			$controller = $this->controller_not_found;

 			// Add empty route as last route to prevent this greedy regexp to match request uri before right time
 			if ($this->empty_route)