MDL-76362 core: Short circuit s() on empty values

marxjohnson · Jan 23, 2023 · 5d3cb79 · 5d3cb79
1 parent 19bedb8
commit 5d3cb79
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/lib/weblib.php b/lib/weblib.php
@@ -91,13 +91,18 @@
  * @return string
  */
 function s($var) {
-
     if ($var === false) {
         return '0';
     }
 
-    return preg_replace('/&amp;#(\d+|x[0-9a-f]+);/i', '&#$1;',
-            htmlspecialchars($var ?? '', ENT_QUOTES | ENT_HTML401 | ENT_SUBSTITUTE));
+    if ($var === null || $var === '') {
+        return '';
+    }
+
+    return preg_replace(
+        '/&amp;#(\d+|x[0-9a-f]+);/i', '&#$1;',
+        htmlspecialchars($var, ENT_QUOTES | ENT_HTML401 | ENT_SUBSTITUTE)
+    );
 }
 
 /**