Merge branch 'b-7.2.x-OXDEV-7203' into b-7.2.x

OXID-eSales · Sep 6, 2024 · 6f647e3 · 6f647e3
2 parents 0f89acc + 6c639be
commit 6f647e3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
@@ -5,6 +5,9 @@
 ### Removed
 - PHP v8.1 support
 
+### 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
         ];