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

2012-02-07 10:52:01 +00:00
parent 52279d53e5
commit 684f6a7009
1 changed files with 8 additions and 1 deletions
@@ -562,10 +562,17 @@ class DispatcherCore
 				if (preg_match($route['regexp'], $this->request_uri, $m))
 				{
 					// Route found ! Now fill $_GET with parameters of uri
-					$controller = $route['controller'];
 					foreach ($m as $k => $v)
 						if (!is_numeric($k))
 							$_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;
 				}