{capture} creates Html object only in HTML-TEXT context

nette · Feb 24, 2021 · d50cdca · d50cdca
1 parent 1369070
commit d50cdca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/Latte/Macros/CoreMacros.php b/src/Latte/Macros/CoreMacros.php
@@ -407,7 +407,7 @@ public function macroCapture(MacroNode $node, PhpWriter $writer): string
 	 */
 	public function macroCaptureEnd(MacroNode $node, PhpWriter $writer): string
 	{
-		$body = in_array($node->context[0], [Engine::CONTENT_HTML, Engine::CONTENT_XHTML], true)
+		$body = in_array(implode($node->context), [Engine::CONTENT_HTML, Engine::CONTENT_XHTML], true)
 			? 'ob_get_length() ? new LR\\Html(ob_get_clean()) : ob_get_clean()'
 			: 'ob_get_clean()';
 		return $writer->write(

diff --git a/tests/Latte/CoreMacros.capture.phpt b/tests/Latte/CoreMacros.capture.phpt
@@ -45,3 +45,8 @@ Assert::match( // bug #215
 	'',
 	$latte->renderToString('{capture $var|strip} <html> {/capture}')
 );
+
+Assert::match(
+	'<!--  --> &lt;foo&gt;',
+	$latte->renderToString('<!-- {capture $x}<foo>{/capture} --> {$x}')
+);