dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//revert boulette

Browse Source
This commit is contained in:
vAugagneur
2013-01-15 15:04:20 +01:00
parent e3e9651f39
commit 2c0bebef47
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Dispatcher.php
+13 -1
View File
@@ -396,6 +396,18 @@ class DispatcherCore
$this->default_routes[$route] = array_merge($this->default_routes[$route], $route_details); $this->default_routes[$route] = array_merge($this->default_routes[$route], $route_details);
} }
// Set default routes
foreach (Language::getLanguages() as $lang)
foreach ($this->default_routes as $id => $route)
$this->addRoute(
$id,
$route['rule'],
$route['controller'],
$lang['id_lang'],
$route['keywords'],
isset($route['params']) ? $route['params'] : array()
);
// Load the custom routes prior the defaults to avoid infinite loops // Load the custom routes prior the defaults to avoid infinite loops
if ($this->use_routes) if ($this->use_routes)
{ {
@@ -431,7 +443,7 @@ class DispatcherCore
foreach (Language::getLanguages() as $lang) foreach (Language::getLanguages() as $lang)
$this->addRoute( $this->addRoute(
$route_id, $route_id,
$custom_route ? $custom_route : $route['rule'], $custom_route,
$route_data['controller'], $route_data['controller'],
$lang['id_lang'], $lang['id_lang'],
$route_data['keywords'], $route_data['keywords'],