Merge branch 'wxiaoguang-fix-escape-5.0'

smarty-php · Feb 5, 2024 · 15e48b6 · 15e48b6
2 parents 0912124 + d5adea5
commit 15e48b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog/930.md b/changelog/930.md
@@ -0,0 +1 @@
+- Fix incorrect compilation of expressions when escape_html=true [#930](https://github.com/smarty-php/smarty/pull/930)
diff --git a/src/Compile/PrintExpressionCompiler.php b/src/Compile/PrintExpressionCompiler.php
@@ -84,7 +84,7 @@ public function compile($args, \Smarty\Compiler\Template $compiler, $parameter =
 				}
 
 				if ($compiler->getTemplate()->getSmarty()->escape_html) {
-					$output = "htmlspecialchars((string) {$output}, ENT_QUOTES, '" . addslashes(\Smarty\Smarty::$_CHARSET) . "')";
+					$output = "htmlspecialchars((string) ({$output}), ENT_QUOTES, '" . addslashes(\Smarty\Smarty::$_CHARSET) . "')";
 				}
 
 			}