// Fix modules front controller in dispatcher #PSFV-449

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13066 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie committed 2012-02-07 10:52:01 +00:00
1 parent 5afa3b2dd9
commit 610a454a1d
1 file changed
+8 -1
+8 -1
View File
@@ -562,10 +562,17 @@ class DispatcherCore
if (preg_match($route['regexp'], $this->request_uri, $m)) if (preg_match($route['regexp'], $this->request_uri, $m))
{ {
// Route found ! Now fill $_GET with parameters of uri // Route found ! Now fill $_GET with parameters of uri
$controller = $route['controller'];
foreach ($m as $k => $v) foreach ($m as $k => $v)
if (!is_numeric($k)) if (!is_numeric($k))
$_GET[$k] = $v; $_GET[$k] = $v;
$controller = $route['controller'] ? $route['controller'] : $_GET['controller'];
if (!empty($route['params']))
foreach ($route['params'] as $k => $v)
$_GET[$k] = $v;
if (isset($_GET['fc']) && $_GET['fc'] == 'module')
$this->front_controller = self::FC_MODULE;
break; break;
} }