Antlers: Prevent isConditionProcessor from leaking on else branches (…

…#8067)
statamic · May 6, 2023 · 7e01ac2 · 7e01ac2
1 parent fdfe4d1
commit 7e01ac2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/View/Antlers/Language/Runtime/ConditionProcessor.php b/src/View/Antlers/Language/Runtime/ConditionProcessor.php
@@ -35,6 +35,8 @@ public function process(ConditionNode $node, $data)
 
         foreach ($node->logicBranches as $branch) {
             if ($branch->head->name->name == 'else') {
+                $this->processor->setIsConditionProcessor($condValueToRestore);
+
                 return $branch;
             } else {
                 // Let the processor know that it is being used

diff --git a/tests/Antlers/Runtime/YieldTest.php b/tests/Antlers/Runtime/YieldTest.php
@@ -430,4 +430,28 @@ public function test_yield_can_be_used_inside_conditions()
 
         $this->assertSame('', trim($this->renderString($template, [], true)));
     }
+
+    public function test_condition_blocks_do_not_leak_their_condition_state()
+    {
+        $template = <<<'EOT'
+{{ if false }}
+    {{# It doesn't matter whats inside here #}}
+{{ else }}
+    Else Statement.
+{{ /if }}
+
+{{ section:seo_body }}Content{{ section:seo_body }}
+
+{{ yield:seo_body }}
+EOT;
+
+        $expected = <<<'EXPECTED'
+Else Statement.
+
+
+Content
+EXPECTED;
+
+        $this->assertSame($expected, trim($this->renderString($template, [], true)));
+    }
 }