Filters: compatibility with JS binding

thx @janbarasek
nette · Feb 8, 2021 · 108d4a7 · 108d4a7
1 parent baf2071
commit 108d4a7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Latte/Runtime/Filters.php b/src/Latte/Runtime/Filters.php
@@ -45,9 +45,12 @@ public static function escapeHtml($s): string
 	 */
 	public static function escapeHtmlText($s): string
 	{
-		return $s instanceof HtmlStringable || $s instanceof \Nette\Utils\IHtmlString
-			? $s->__toString(true)
-			: htmlspecialchars((string) $s, ENT_NOQUOTES | ENT_SUBSTITUTE, 'UTF-8');
+		if ($s instanceof HtmlStringable || $s instanceof \Nette\Utils\IHtmlString) {
+			return $s->__toString(true);
+		}
+		$s = htmlspecialchars((string) $s, ENT_NOQUOTES | ENT_SUBSTITUTE, 'UTF-8');
+		$s = str_replace('{{', '{<!-- -->{', $s);
+		return $s;
 	}
 
 

diff --git a/tests/Latte/Filters.escapeHtmlText().phpt b/tests/Latte/Filters.escapeHtmlText().phpt
@@ -35,3 +35,6 @@ Assert::same('`hello', Filters::escapeHtmlText('`hello'));
 // invalid UTF-8
 Assert::same("foo \u{FFFD} bar", Filters::escapeHtmlText("foo \u{D800} bar")); // invalid codepoint high surrogates
 Assert::same("foo \u{FFFD}\" bar", Filters::escapeHtmlText("foo \xE3\x80\x22 bar")); // stripped UTF
+
+// JS
+Assert::same('hello {<!-- -->{ worlds }}', Filters::escapeHtmlText('hello {{ worlds }}'));