Merge pull request #914 from tractorcow-farm/8.0

Merge 8.0 into 8
tractorcow-farm · Dec 16, 2024 · 486aed9 · 486aed9
2 parents d174925 + 7e98a0b
commit 486aed9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Extension/FluentCMSMainExtension.php b/src/Extension/FluentCMSMainExtension.php
@@ -106,7 +106,7 @@ public function publish_localised_copy($data, $form)
     protected function getRecordForLocalisedAction($data, $form): ?DataObject
     {
         $id = (int) $data['ID'];
-        $className = $this->owner->config()->get('model_class');
+        $className = $this->owner->getModelClass();
 
         if (!$id || !$className) {
             // Invalid inputs

diff --git a/src/Middleware/LocaleSwitchRedirector.php b/src/Middleware/LocaleSwitchRedirector.php
@@ -32,6 +32,7 @@ public function process(HTTPRequest $request, callable $delegate)
         if ($response->getStatusCode() === 404
             && !$state->getIsFrontend()
             && $this->getParamLocale($request)
+            && !$request->getVar('CMSPreview')
         ) {
             // Redirect to the CMS home page if the requested page doesn't exist
             $response = new HTTPResponse();