Fix mishandled language change

getformwork · Jun 16, 2024 · 221aad5 · 221aad5
1 parent 1187cfd
commit 221aad5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/formwork/src/Pages/Page.php b/formwork/src/Pages/Page.php
@@ -372,8 +372,8 @@ public function setLanguage(Language|string|null $language): void
             return;
         }
 
-        if ($this->languages()->current() !== null && $language !== null && $this->languages()->current()->code() !== ($code = $language->code())) {
-            if (!$this->languages()->available()->has($code)) {
+        if ($this->languages()->current()?->code() !== ($code = $language?->code())) {
+            if ($code !== null && !$this->languages()->available()->has($code)) {
                 throw new InvalidArgumentException(sprintf('Invalid page language "%s"', $code));
             }
             $this->reload(['language' => $language]);

diff --git a/formwork/src/Panel/Controllers/PagesController.php b/formwork/src/Panel/Controllers/PagesController.php
@@ -200,6 +200,9 @@ public function edit(RouteParams $routeParams): Response
                 }
 
                 // Redirect to avoid ERR_CACHE_MISS
+                if ($routeParams->has('language')) {
+                    return $this->redirect($this->generateRoute('panel.pages.edit.lang', ['page' => $page->route(), 'language' => $routeParams->get('language')]));
+                }
                 return $this->redirect($this->generateRoute('panel.pages.edit', ['page' => $page->route()]));
         }