Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-01 12:20:22 +01:00
Code Issues Packages Projects Releases Activity

more robust logic

Browse Source
This commit is contained in:
Andy Miller
2015-07-06 21:08:45 -06:00
parent 3ab1feb7b1
commit 3a7426ed04
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
system/src/Grav/Common/Uri.php
View File

@@ -95,9 +95,13 @@ class Uri
$uri = $language->setActiveFromUri($uri);
// redirect to language specific homepage if configured to do so
if ($uri == '/' && $language->enabled() && $config->get('system.languages.home.redirect', true) && !$language->getActive()) {
$prefix = $config->get('system.languages.home.include_lang', true) ? $language->getDefault() . '/' : '';
$grav->redirect($prefix . Pages::getHomeRoute());
if ($uri == '/' && $language->enabled() && !$language->getActive()) {
if ($config->get('system.languages.home_redirect.include_route', true)) {
$prefix = $config->get('system.languages.home_redirect.include_lang', true) ? $language->getDefault() . '/' : '';
$grav->redirect($prefix . Pages::getHomeRoute());
} elseif ($config->get('system.languages.home_redirect.include_lang', true)) {
$grav->redirect($language->getDefault() . '/');
}
}
// split the URL and params