Merge branch 'develop'

daun · daun · commit 2feb5d9d3ecf · 2024-12-18T23:22:48.000+01:00
diff --git a/DashboardPanel.class.php b/DashboardPanel.class.php
@@ -401,17 +401,21 @@ protected function renderAttributes($attributes = [])
         if (!is_array($attributes)) {
             return $attributes;
         }
+
         if (empty($attributes)) {
             return '';
         }
 
         $attributePairs = [];
         foreach ($attributes as $key => $val) {
+            if ($val === false || $val === null) {
+                continue;
+            }
             if (is_int($key)) {
                 $attributePairs[] = $val;
                 continue;
             }
-            $val = htmlspecialchars($val, ENT_QUOTES);
+            $val = htmlspecialchars((string) $val, ENT_QUOTES);
             $attributePairs[] = "{$key}=\"{$val}\"";
         }
 

Original file line number	Diff line number	Diff line change
`@@ -401,17 +401,21 @@ protected function renderAttributes($attributes = [])`
`401`	`401`	`if (!is_array($attributes)) {`
`402`	`402`	`return $attributes;`
`403`	`403`	`}`
	`404`	`+`
`404`	`405`	`if (empty($attributes)) {`
`405`	`406`	`return '';`
`406`	`407`	`}`
`407`	`408`
`408`	`409`	`$attributePairs = [];`
`409`	`410`	`foreach ($attributes as $key => $val) {`
	`411`	`+ if ($val === false \|\| $val === null) {`
	`412`	`+ continue;`
	`413`	`+ }`
`410`	`414`	`if (is_int($key)) {`
`411`	`415`	`$attributePairs[] = $val;`
`412`	`416`	`continue;`
`413`	`417`	`}`
`414`		`- $val = htmlspecialchars($val, ENT_QUOTES);`
	`418`	`+ $val = htmlspecialchars((string) $val, ENT_QUOTES);`
`415`	`419`	`$attributePairs[] = "{$key}=\"{$val}\"";`
`416`	`420`	`}`
`417`	`421`