Merge branch 'b-7.2.x' into b-8.0.x

OXID-eSales · Sep 6, 2024 · 5878039 · 5878039
2 parents 4a4aa25 + 6f647e3
commit 5878039
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
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
         ];