build i18n context if document is a fallback document

fix #105
dachcom-digital · Oct 17, 2022 · 7cfe366 · 7cfe366
1 parent 7b70f8b
commit 7cfe366
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/I18nBundle/EventListener/I18nStartupListener.php b/src/I18nBundle/EventListener/I18nStartupListener.php
@@ -73,7 +73,8 @@ public function onKernelRequest(RequestEvent $event): void
             return;
         }
 
-        if ($document instanceof Document\Link) {
+        if ($document instanceof Document\Link && !$this->pimcoreDocumentResolver->isFallbackDocument($document)) {
+            // only skip context building if the *requested* document is a link
             return;
         }
 

diff --git a/src/I18nBundle/Resolver/PimcoreDocumentResolver.php b/src/I18nBundle/Resolver/PimcoreDocumentResolver.php
@@ -45,6 +45,15 @@ public function getDocument(Request $request): ?Document
         return $this->findFallback($request);
     }
 
+    public function isFallbackDocument(Document $document): bool
+    {
+        if (!$this->nearestDocument instanceof Document) {
+            return false;
+        }
+
+        return $this->nearestDocument->getId() === $document->getId();
+    }
+
     protected function findFallback(Request $request): ?Document
     {
         if (!$this->requestHelper->matchesDefaultPimcoreContext($request)) {

diff --git a/src/I18nBundle/Resolver/PimcoreDocumentResolverInterface.php b/src/I18nBundle/Resolver/PimcoreDocumentResolverInterface.php
@@ -8,4 +8,6 @@
 interface PimcoreDocumentResolverInterface
 {
     public function getDocument(Request $request): ?Document;
+
+    public function isFallbackDocument(Document $document): bool;
 }