Fix the front end preview (see contao#1972)

Description ----------- | Q | A | -----------------| --- | Fixed issues | Fixes contao#1968 | Docs PR or issue | - Commits ------- 8f44044 Fix the front end preview 0c321e4 Use Request::getBaseUrl() 9e3c402 Reset the tests 3148aee Adjust the test
AlexejKossmann · Apr 6, 2021 · fc4e562 · fc4e562
1 parent 274e2a9
commit fc4e562
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 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('/');
+        return new RedirectResponse($request->getBaseUrl().'/');
     }
 }
diff --git a/core-bundle/tests/Controller/BackendPreviewControllerTest.php b/core-bundle/tests/Controller/BackendPreviewControllerTest.php
@@ -111,11 +111,18 @@ public function testRedirectsToRootPage(): void
             $this->mockAuthorizationChecker()
         );
 
+        $request = $this->mockRequest();
+        $request
+            ->expects($this->once())
+            ->method('getBaseUrl')
+            ->willReturn('/preview.php')
+        ;
+
         /** @var RedirectResponse $response */
-        $response = $controller($this->mockRequest());
+        $response = $controller($request);
 
         $this->assertInstanceOf(RedirectResponse::class, $response);
-        $this->assertSame('/', $response->getTargetUrl());
+        $this->assertSame('/preview.php/', $response->getTargetUrl());
     }
 
     /**