From a7bd1099c505bc0e644a41c13d980c8911c85378 Mon Sep 17 00:00:00 2001 From: Oreolek Date: Fri, 2 Aug 2013 14:36:59 +0700 Subject: [PATCH] Fixed a bug with routes ($config not set) --- classes/Multilang/Route.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/classes/Multilang/Route.php b/classes/Multilang/Route.php index d94f483..18f1171 100644 --- a/classes/Multilang/Route.php +++ b/classes/Multilang/Route.php @@ -61,8 +61,12 @@ class Multilang_Route extends Kohana_Route { $name = $lang.'.'.$name; } // then the default language - elseif(isset(Route::$_routes[Kohana::$config->load('multilang')->default.'.'.$name])) { - $name = $config->default.'.'.$name; + else + { + $default_name = Kohana::$config->load('multilang')->default.'.'.$name; + if(isset(Route::$_routes[$default_name])) { + $name = $default_name; + } } // And if we don't have any for this language, it means that route is neither defined nor multilingual return parent::get($name); @@ -343,4 +347,4 @@ class Multilang_Route extends Kohana_Route { return $params; } -} \ No newline at end of file +}