Merge pull request #108 from dachcom-digital/fix_missing_site_attribute

Fix missing site attribute
dachcom-digital · Oct 25, 2022 · 47c969d · 47c969d
2 parents 7b70f8b + 6d34559
commit 47c969d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,9 +1,10 @@
 # Upgrade Notes
 
+## 4.0.6
+- [BUGFIX] Fix missing site attribute in error page [#107](https://github.com/dachcom-digital/pimcore-i18n/issues/107)
 ## 4.0.5
 - [BUGFIX] Wrong Error Page in Static Route Context  [@Zodiarc](https://github.com/dachcom-digital/pimcore-i18n/issues/96)
 - [BUGFIX] Properly overriding Pimcore ResponseExceptionListener and multisite error page [@Zodiarc](https://github.com/dachcom-digital/pimcore-i18n/pull/101)
-
 ## 4.0.4
 - [IMPROVEMENT] Check against `isFrontendRequestByAdmin` in route item builder
 ## 4.0.3
@@ -98,4 +99,4 @@ i18n:
 
 ***
 
-I18nBundle 3.x Upgrade Notes: https://github.com/dachcom-digital/pimcore-i18n/blob/3.x/UPGRADE.md
+I18nBundle 3.x Upgrade Notes: https://github.com/dachcom-digital/pimcore-i18n/blob/3.x/UPGRADE.md
diff --git a/src/I18nBundle/EventListener/Frontend/ResponseExceptionListener.php b/src/I18nBundle/EventListener/Frontend/ResponseExceptionListener.php
@@ -141,10 +141,14 @@ protected function handleErrorPage(ExceptionEvent $event): void
         $this->enablePimcoreContext();
 
         try {
-            $response = $this->documentRenderer->render($document, [
-                'exception' => $exception,
+            $attributes = [
+                'exception'                                                       => $exception,
                 PimcoreContextListener::ATTRIBUTE_PIMCORE_CONTEXT_FORCE_RESOLVING => true,
-            ]);
+            ];
+            if ($request->attributes->has(SiteResolver::ATTRIBUTE_SITE)) {
+                $attributes[SiteResolver::ATTRIBUTE_SITE] = $request->attributes->get(SiteResolver::ATTRIBUTE_SITE);
+            }
+            $response = $this->documentRenderer->render($document, $attributes);
         } catch (\Exception $e) {
             // we are even not able to render the error page, so we send the client a unicorn
             $response = 'Page not found. 🦄';