Compiler: set default $contentType

nette · Jun 27, 2016 · f8fa6c5 · f8fa6c5
1 parent ead1f85
commit f8fa6c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Latte/Compiler/Compiler.php b/src/Latte/Compiler/Compiler.php
@@ -40,7 +40,7 @@ class Compiler
 	private $placeholders = [];
 
 	/** @var string */
-	private $contentType;
+	private $contentType = self::CONTENT_HTML;
 
 	/** @var array [context, subcontext] */
 	private $context;

diff --git a/tests/Latte/CoreMacros.translate.phpt b/tests/Latte/CoreMacros.translate.phpt
@@ -15,5 +15,5 @@ $compiler = new Latte\Compiler;
 CoreMacros::install($compiler);
 
 // {_...}
-Assert::same('<?php echo call_user_func($this->filters->escape, call_user_func($this->filters->translate, \'var\')) ?>',  $compiler->expandMacro('_', 'var', '')->openingCode);
-Assert::same('<?php echo call_user_func($this->filters->escape, call_user_func($this->filters->filter, call_user_func($this->filters->translate, \'var\'))) ?>',  $compiler->expandMacro('_', 'var', '|filter')->openingCode);
+Assert::same('<?php echo LR\Filters::escapeHtmlText(call_user_func($this->filters->translate, \'var\')) ?>',  $compiler->expandMacro('_', 'var', '')->openingCode);
+Assert::same('<?php echo LR\Filters::escapeHtmlText(call_user_func($this->filters->filter, call_user_func($this->filters->translate, \'var\'))) ?>',  $compiler->expandMacro('_', 'var', '|filter')->openingCode);