Merge remote-tracking branch 'origin/1.6' into 1.6

This commit is contained in:
Matias Griese
2019-01-23 21:24:37 +02:00

View File

@@ -57,7 +57,7 @@ class InitializeProcessor extends ProcessorBase
&& $config->get('system.pages.redirect_trailing_slash', false) && $config->get('system.pages.redirect_trailing_slash', false)
&& Utils::endsWith($path, '/')) { && Utils::endsWith($path, '/')) {
$redirect = (string) $uri->getCurrentRoute()->withRoot(''); $redirect = (string) $uri->getCurrentRoute()->toString();
$this->container->redirectLangSafe($redirect); $this->container->redirectLangSafe($redirect);
} }