[FIX] Deprecated htmlspecialchars().

Seiger · Seiger · commit 9436cb6fac1e · 2024-09-17T17:22:16.000+03:00
diff --git a/core/src/Legacy/PhpCompat.php b/core/src/Legacy/PhpCompat.php
@@ -17,7 +17,6 @@ class PhpCompat implements PhpCompatInterface
     public function htmlspecialchars($str = '', $flags = ENT_COMPAT, $encode = '', $safecount = 0)
     {
         $safecount++;
-        $modx = evolutionCMS();
 
         if (1000 < $safecount) {
             exit("error too many loops '{$safecount}'");
@@ -29,9 +28,9 @@ public function htmlspecialchars($str = '', $flags = ENT_COMPAT, $encode = '', $
             }
         } elseif ($str !== '') {
             if ($encode !== '') {
-                $encode = $modx->getConfig('modx_charset');
+                $encode = evo()->getConfig('modx_charset');
             }
-            $ent_str = htmlspecialchars($str, $flags, $encode);
+            $ent_str = htmlspecialchars(($str ?? ''), $flags, $encode);
 
             if (!empty($str) && empty($ent_str)) {
                 $detect_order = implode(',', mb_detect_order());

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ class PhpCompat implements PhpCompatInterface`
`17`	`17`	`public function htmlspecialchars($str = '', $flags = ENT_COMPAT, $encode = '', $safecount = 0)`
`18`	`18`	`{`
`19`	`19`	`$safecount++;`
`20`		`- $modx = evolutionCMS();`
`21`	`20`
`22`	`21`	`if (1000 < $safecount) {`
`23`	`22`	`exit("error too many loops '{$safecount}'");`
`@@ -29,9 +28,9 @@ public function htmlspecialchars($str = '', $flags = ENT_COMPAT, $encode = '', $`
`29`	`28`	`}`
`30`	`29`	`} elseif ($str !== '') {`
`31`	`30`	`if ($encode !== '') {`
`32`		`- $encode = $modx->getConfig('modx_charset');`
	`31`	`+ $encode = evo()->getConfig('modx_charset');`
`33`	`32`	`}`
`34`		`- $ent_str = htmlspecialchars($str, $flags, $encode);`
	`33`	`+ $ent_str = htmlspecialchars(($str ?? ''), $flags, $encode);`
`35`	`34`
`36`	`35`	`if (!empty($str) && empty($ent_str)) {`
`37`	`36`	`$detect_order = implode(',', mb_detect_order());`