From 3a7426ed0463e800f41b2a00a6a56b98a723867d Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 6 Jul 2015 21:08:45 -0600 Subject: [PATCH] more robust logic --- system/src/Grav/Common/Uri.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php index 2bd667fa1..65d4df667 100644 --- a/system/src/Grav/Common/Uri.php +++ b/system/src/Grav/Common/Uri.php @@ -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