Fix clashing global twig variable

sonata-project · Dec 7, 2023 · c86da15 · c86da15
1 parent d327aa0
commit c86da15
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/Controller/CRUDController.php b/src/Controller/CRUDController.php
@@ -997,15 +997,18 @@ final public function setTwigGlobals(Request $request): void
         $twig = $this->container->get('twig');
         \assert($twig instanceof Environment);
 
-        $twig->addGlobal('admin', $this->admin);
+        try {
+            $twig->addGlobal('admin', $this->admin);
 
-        if ($this->isXmlHttpRequest($request)) {
-            $baseTemplate = $this->templateRegistry->getTemplate('ajax');
-        } else {
-            $baseTemplate = $this->templateRegistry->getTemplate('layout');
-        }
+            if ($this->isXmlHttpRequest($request)) {
+                $baseTemplate = $this->templateRegistry->getTemplate('ajax');
+            } else {
+                $baseTemplate = $this->templateRegistry->getTemplate('layout');
+            }
 
-        $twig->addGlobal('base_template', $baseTemplate);
+            $twig->addGlobal('base_template', $baseTemplate);
+        } catch (\LogicException) {
+        }
     }
 
     /**