Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop

This commit is contained in:
Florian HENRY
2021-01-07 17:54:49 +01:00
113 changed files with 1848 additions and 1103 deletions

View File

@@ -680,7 +680,8 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
if (!is_array($out)) {
// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
// '../' is dangerous because it allows dir transversals
$out = str_replace(array('"', '"', '../'), '', trim($out));
$out = str_replace(array('"', '"'), "''", trim($out));
$out = str_replace(array('../'), '', $out);
// keep lines feed
$out = dol_string_nohtmltag($out, 0);
}