BlockMacros: fixed expandTokens in dynamic blocks (#125)

nette · Jul 5, 2016 · 8815314 · 8815314
1 parent 2c45c38
commit 8815314
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/Latte/Macros/BlockMacros.php b/src/Latte/Macros/BlockMacros.php
@@ -351,7 +351,7 @@ public function macroBlockEnd(MacroNode $node, PhpWriter $writer)
 				$node->content = rtrim($node->content, " \t");
 				$this->getCompiler()->addMethod(
 					$node->data->func,
-					"extract(\$_args);\n?>$node->content<?php",
+					$this->getCompiler()->expandTokens("extract(\$_args);\n?>$node->content<?php"),
 					'$_args'
 				);
 				$node->content = '';

diff --git a/tests/Latte/BlockMacros.dynamicblock.phpt b/tests/Latte/BlockMacros.dynamicblock.phpt
@@ -33,7 +33,7 @@ $template = <<<'EOD'
 
 {include #$name . '', var => 40}
 
-{block word$name}{/block}
+{block word$name}<div n:if="false"></div>{/block}
 {block "word$name"}{/block}
 
 EOD;

diff --git a/tests/Latte/expected/BlockMacros.dynamicblock.phtml b/tests/Latte/expected/BlockMacros.dynamicblock.phtml
@@ -88,6 +88,9 @@ class Template%a% extends Latte\Runtime\Template
 	function blockWord_name($_args)
 	{
 		extract($_args);
+		if (false) {
+			?><div></div><?php
+		}
 
 	}