OXDEV-7203 IfcontentNode must only parse body for existing content

OXID-eSales · Jul 3, 2024 · 6c639be · 6c639be
1 parent 7a40538
commit 6c639be
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
@@ -1,5 +1,10 @@
 # Change Log for OXID Twig engine component
 
+## [Undecided] - unreleased
+
+### Fixed
+- Ifcontent will parse body even if content not existing [#0007231](https://bugs.oxid-esales.com/view.php?id=7231) 
+
 ## v2.4.0 - 2024-03-15
 
 ### Added

diff --git a/src/Node/IfContentNode.php b/src/Node/IfContentNode.php
@@ -46,7 +46,11 @@ public function compile(Compiler $compiler): void
         $compiler->raw(");\n");
 
         $compiler
+            ->write("if(")
+            ->subcompile($this->getNode('variable'), false)
+            ->write(") { \n")
             ->subcompile($this->getNode('body'))
+            ->write(" } \n")
             ->write("unset(")->subcompile($this->getNode('variable'))->raw(");\n");
     }
 }
diff --git a/tests/Unit/Node/IfContentNodeTest.php b/tests/Unit/Node/IfContentNodeTest.php
@@ -50,7 +50,9 @@ public static function getOxidTwigTests(): array
         $tests[] = [$node, <<<EOF
 // line 1
 \$context["foo"] = \$this->extensions['$ifContentExtensionClass']->getContent("oxsomething", null);
+if(\$context["foo"]) { 
 echo "Lorem Ipsum";
+ } 
 unset(\$context["foo"]);
 EOF
         ];
@@ -59,7 +61,9 @@ public static function getOxidTwigTests(): array
         $tests[] = [$node, <<<EOF
 // line 1
 \$context["foo"] = \$this->extensions['$ifContentExtensionClass']->getContent(null, "oxsomething");
+if(\$context["foo"]) { 
 echo "Lorem Ipsum";
+ } 
 unset(\$context["foo"]);
 EOF
         ];