Fixed a bug with routes ($config not set)

This commit is contained in:
Alexander Yakovlev 2013-08-02 14:36:59 +07:00
parent d4e7d8d246
commit a7bd1099c5
1 changed files with 7 additions and 3 deletions

View File

@ -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);