Fix position to call setupSiteInterfaceLocalization function

See discussion about this change: concretecms#7909
hissy · Jul 21, 2021 · 9eff103 · 9eff103
1 parent 0b62094
commit 9eff103
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/concrete/src/Http/ResponseFactory.php b/concrete/src/Http/ResponseFactory.php
@@ -93,6 +93,8 @@ public function notFound($content, $code = Response::HTTP_NOT_FOUND, $headers =
 
         if (is_object($c) && !$c->isError()) {
             // Display not found
+            $dl = $this->app->make('multilingual/detector');
+            $dl->setupSiteInterfaceLocalization($c);
             $this->request->setCurrentPage($c);
 
             return $this->controller($c->getPageController(), $code, $headers);
@@ -122,6 +124,8 @@ public function forbidden($requestUrl, $code = Response::HTTP_FORBIDDEN, $header
         $item = '/page_forbidden';
         $c = Page::getByPath($item);
         if (is_object($c) && !$c->isError()) {
+            $dl = $this->app->make('multilingual/detector');
+            $dl->setupSiteInterfaceLocalization($c);
             $this->request->setCurrentPage($c);
 
             return $this->controller($c->getPageController(), $code, $headers);
@@ -229,8 +233,6 @@ public function collection(Collection $collection, $code = Response::HTTP_OK, $h
         }
 
         $dl = $this->app->make('multilingual/detector');
-        $dl->setupSiteInterfaceLocalization($collection);
-
         $request = $this->request;
 
         if ($collection->isError() && $collection->getError() == COLLECTION_NOT_FOUND) {
@@ -259,6 +261,7 @@ public function collection(Collection $collection, $code = Response::HTTP_OK, $h
             if ($smm == 1 && !Key::getByHandle('view_in_maintenance_mode')->validate() && ($_SERVER['REQUEST_METHOD'] != 'POST' || $this->app->make('token')->validate() == false)) {
                 $v = new View('/frontend/maintenance_mode');
                 $v->addScopeItems(['c' => $collection]);
+                $dl->setupSiteInterfaceLocalization($collection);
                 $request->setCurrentPage($collection);
 
                 return $this->view($v, $code, $headers);
@@ -339,6 +342,7 @@ public function collection(Collection $collection, $code = Response::HTTP_OK, $h
             }
         }
 
+        $dl->setupSiteInterfaceLocalization($collection);
         $request->setCurrentPage($collection);
         $c = $collection; // process.php needs this
         require DIR_BASE_CORE . '/bootstrap/process.php';