Fix for subfolder install [#2964]

getgrav · Dec 15, 2020 · 307ede3 · 307ede3
1 parent 26f4d05
commit 307ede3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/system/src/Grav/Common/Processors/InitializeProcessor.php b/system/src/Grav/Common/Processors/InitializeProcessor.php
@@ -383,10 +383,10 @@ protected function handleRedirectRequest(RequestInterface $request): ?ResponseIn
     {
         // Redirect pages with trailing slash if configured to do so.
         $uri = $request->getUri();
-        $path = $request->getUri()->getPath() ?: '/';
+        $path = $uri->getPath() ?: '/';
+        $root = $this->container['uri']->rootUrl();
 
-        if ($path !== '/' && Utils::endsWith($path, '/')
-        ) {
+        if ($path !== $root && $path !== $root . '/' && Utils::endsWith($path, '/')) {
             return $this->container->getRedirectResponse((string)$uri->withPath(rtrim($path, '/')));
         }