Merge branch 'develop' into 1.6

This commit is contained in:
Andy Miller
2018-11-25 19:08:01 -07:00

View File

@@ -54,7 +54,7 @@ class InitializeProcessor extends ProcessorBase
// Redirect pages with trailing slash if configured to do so.
$path = $uri->path() ?: '/';
if ($path !== '/' && $config->get('system.pages.redirect_trailing_slash', false) && Utils::endsWith($path, '/')) {
$this->container->redirect(rtrim($path, '/'));
$this->container->redirectLangSafe(rtrim($path, '/'));
}
$this->container->setLocale();