escaper should return 'null' on null value

zemit-cms · Feb 21, 2024 · 109dddb · 109dddb
1 parent b17f2b8
commit 109dddb
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Html/Escaper.php b/src/Html/Escaper.php
@@ -27,7 +27,11 @@ class Escaper extends \Phalcon\Html\Escaper
      */
     public function escapeJson(mixed $json = null): string
     {
+        if (is_null($json)) {
+            return 'null';
+        }
+
         // raw url encode
-        return rawurlencode(json_validate($json) ? $json ?? '' : json_encode($json));
+        return rawurlencode(json_validate($json) ? $json : json_encode($json));
     }
 }