Merge pull request #7 from m-vo/bugfix/fe-page-caching

Fix fe_* templates not setting cache headers
m-vo · Feb 28, 2021 · a82bc2e · a82bc2e
2 parents 0ba8d6b + 1db779d
commit a82bc2e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/EventListener/RenderingForwarder.php b/src/EventListener/RenderingForwarder.php
@@ -21,6 +21,7 @@ class RenderingForwarder
 {
     private const TWIG_TEMPLATE = 'twig_template';
     private const TEMPLATE_CONTEXT = 'context';
+    private const CONTAO_TEMPLATE = 'contao_template';
 
     private Environment $twig;
     private TemplateLocator $templateLocator;
@@ -79,7 +80,8 @@ public function registerTemplates(): void
      */
     public function delegateRendering(Template $contaoTemplate): void
     {
-        $template = $this->templates[$contaoTemplate->getName()] ?? null;
+        $originalName = $contaoTemplate->getName();
+        $template = $this->templates[$originalName] ?? null;
 
         if (null === $template) {
             return;
@@ -91,6 +93,7 @@ public function delegateRendering(Template $contaoTemplate): void
         $contaoTemplate->setData([
             self::TWIG_TEMPLATE => $template,
             self::TEMPLATE_CONTEXT => $contaoTemplate->getData(),
+            self::CONTAO_TEMPLATE => $originalName,
         ]);
     }
 
@@ -100,6 +103,11 @@ public function render(Template $contaoTemplate): string
 
         $template = $data[self::TWIG_TEMPLATE] ?? null;
         $context = $data[self::TEMPLATE_CONTEXT] ?? null;
+        $originalName = $data[self::CONTAO_TEMPLATE] ?? '';
+
+        // restore old template name, so that FrontendTemplate sets the right
+        // cache headers in case of fe_* templates
+        $contaoTemplate->setName($originalName);
 
         // restore old template context, so that legacy modules are happy
         // (e.g. ModuleNavigation is checking for Template->items)

diff --git a/tests/EventListener/RenderingForwarderTest.php b/tests/EventListener/RenderingForwarderTest.php
@@ -85,6 +85,7 @@ public function testSetsProxyTemplate(): void
             ->with([
                 'twig_template' => 'sub/bar.html.twig',
                 'context' => ['a' => 123],
+                'contao_template' => 'bar',
             ]);
 
         $renderingForwarder->delegateRendering($template);