fix trim htmlspecialchars null param

xiaomlove · xiaomlove · commit 7ef816f52c34 · 2025-01-20T13:35:38.000+08:00
diff --git a/include/functions.php b/include/functions.php
@@ -320,7 +320,7 @@ function format_comment($text, $strip_html = true, $xssclean = false, $newtab =
 	$imageresizer = $imageresizer ? 1 : 0;
 	$s = $text;
 
-	if ($strip_html) {
+	if ($strip_html && !is_null($s)) {
 		$s = htmlspecialchars($s);
 	}
 
@@ -2537,7 +2537,7 @@ function stdhead($title = "", $msgalert = true, $script = "", $place = "")
         foreach ($icons as $icon) {
 
 ?>
-<link rel="stylesheet" href="<?php echo htmlspecialchars(trim($icon['cssfile'], '/')).$cssupdatedate?>" type="text/css" />
+<link rel="stylesheet" href="<?php echo htmlspecialchars(trim($icon['cssfile'] ?? '', '/')).$cssupdatedate?>" type="text/css" />
 <?php
 	}}
 }

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ function format_comment($text, $strip_html = true, $xssclean = false, $newtab =`
`320`	`320`	`$imageresizer = $imageresizer ? 1 : 0;`
`321`	`321`	`$s = $text;`
`322`	`322`
`323`		`- if ($strip_html) {`
	`323`	`+ if ($strip_html && !is_null($s)) {`
`324`	`324`	`$s = htmlspecialchars($s);`
`325`	`325`	`}`
`326`	`326`
`@@ -2537,7 +2537,7 @@ function stdhead($title = "", $msgalert = true, $script = "", $place = "")`
`2537`	`2537`	`foreach ($icons as $icon) {`
`2538`	`2538`
`2539`	`2539`	`?>`
`2540`		`-<link rel="stylesheet" href="<?php echo htmlspecialchars(trim($icon['cssfile'], '/')).$cssupdatedate?>" type="text/css" />`
	`2540`	`+<link rel="stylesheet" href="<?php echo htmlspecialchars(trim($icon['cssfile'] ?? '', '/')).$cssupdatedate?>" type="text/css" />`
`2541`	`2541`	`<?php`
`2542`	`2542`	`}}`
`2543`	`2543`	`}`