Olivier Massot 4 lat temu
rodzic
commit
5272b014d9
1 zmienionych plików z 8 dodań i 5 usunięć
  1. 8 5
      ot_templating/Classes/Page/ErrorHandler.php

+ 8 - 5
ot_templating/Classes/Page/ErrorHandler.php

@@ -3,6 +3,7 @@
 namespace Opentalent\OtTemplating\Page;
 
 use Opentalent\OtCore\Website\OtPageRepository;
+use Opentalent\OtCore\Website\OtWebsiteRepository;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Error\PageErrorHandler\PageContentErrorHandler;
@@ -89,13 +90,15 @@ class ErrorHandler implements PageErrorHandlerInterface
         // This variable aims to prevent redirection loop
         $isCircular = preg_match('/.*\/page-introuvable/', $request->getUri()->getPath());
 
-        $pageRepository = GeneralUtility::makeInstance(ObjectManager::class)->get(OtPageRepository::class);
-        $site = $pageRepository->getCurrentSite();
+        $otWebRepository = GeneralUtility::makeInstance(ObjectManager::class)->get(OtWebsiteRepository::class);
+        $website = $otWebRepository->getCurrentWebsiteFromFEGlobals();
 
-        if ($site && !$isCircular){
-            $homeUri = $site->getBase();
-            $rootUid = $site->getRootPageId();
+        if ($website && !$isCircular){
 
+            $homeUri = $otWebRepository->resolveWebsiteBaseUri($website);
+            $rootUid = $otWebRepository->getWebsiteRootUid($website['uid']);
+
+            $pageRepository = GeneralUtility::makeInstance(ObjectManager::class)->get(OtPageRepository::class);
             $rootPage = $pageRepository->getPage($rootUid);
             if (!empty($rootPage)) {