From 2c0bebef472d0fe3e506bad2d4a5232dbb935808 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Tue, 15 Jan 2013 15:04:20 +0100 Subject: [PATCH] //revert boulette --- classes/Dispatcher.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php index c98ec1afe..000037882 100644 --- a/classes/Dispatcher.php +++ b/classes/Dispatcher.php @@ -396,6 +396,18 @@ class DispatcherCore $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 if ($this->use_routes) { @@ -431,7 +443,7 @@ class DispatcherCore foreach (Language::getLanguages() as $lang) $this->addRoute( $route_id, - $custom_route ? $custom_route : $route['rule'], + $custom_route, $route_data['controller'], $lang['id_lang'], $route_data['keywords'],