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

This commit is contained in:
Andrew Nicols 2023-01-06 22:37:07 +08:00
parent dbfb5eaa45
commit a4ea607c24

View File

@ -91,13 +91,18 @@ define('URL_MATCH_EXACT', 2);
* @return string
*/
function s($var) {
if ($var === false) {
return '0';
}
return preg_replace('/&#(\d+|x[0-9a-f]+);/i', '&#$1;',
htmlspecialchars($var ?? '', ENT_QUOTES | ENT_HTML401 | ENT_SUBSTITUTE));
if ($var === null || $var === '') {
return '';
}
return preg_replace(
'/&#(\d+|x[0-9a-f]+);/i', '&#$1;',
htmlspecialchars($var, ENT_QUOTES | ENT_HTML401 | ENT_SUBSTITUTE)
);
}
/**