Use Request::getBaseUrl()

contao · Jul 24, 2020 · 0c321e4 · 0c321e4
1 parent 8f44044
commit 0c321e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core-bundle/src/Controller/BackendPreviewController.php b/core-bundle/src/Controller/BackendPreviewController.php
@@ -90,6 +90,6 @@ public function __invoke(Request $request): Response
             return new RedirectResponse($targetUrl);
         }
 
-        return new RedirectResponse($this->previewScript ?: '/');
+        return new RedirectResponse($request->getBaseUrl().'/');
     }
 }
diff --git a/core-bundle/tests/Controller/BackendPreviewControllerTest.php b/core-bundle/tests/Controller/BackendPreviewControllerTest.php
@@ -105,7 +105,7 @@ public function testDispatchesPreviewUrlConvertEvent(): void
     public function testRedirectsToRootPage(): void
     {
         $controller = new BackendPreviewController(
-            '',
+            '/',
             $this->createMock(FrontendPreviewAuthenticator::class),
             new EventDispatcher(),
             $this->mockAuthorizationChecker()
@@ -121,7 +121,7 @@ public function testRedirectsToRootPage(): void
     public function testRedirectsToRootPageWitPreviewScript(): void
     {
         $controller = new BackendPreviewController(
-            'preview.php',
+            'preview.php/',
             $this->createMock(FrontendPreviewAuthenticator::class),
             new EventDispatcher(),
             $this->mockAuthorizationChecker()
@@ -131,7 +131,7 @@ public function testRedirectsToRootPageWitPreviewScript(): void
         $response = $controller($this->mockRequest());
 
         $this->assertInstanceOf(RedirectResponse::class, $response);
-        $this->assertSame('preview.php', $response->getTargetUrl());
+        $this->assertSame('preview.php/', $response->getTargetUrl());
     }
 
     /**