Merge branch 'develop' into test/security_dol_eval_ob_cleanup_on_exception

2024-03-11 12:48:31 +01:00
parent 101d56a2c1 4dba1f420e
commit ff0d147847
43 changed files with 764 additions and 456 deletions
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4369,7 +4369,7 @@ function dol_substr($string, $start, $length = null, $stringencoding = '', $trun
 	global $langs;

 	if (empty($stringencoding)) {
-		$stringencoding = $langs->charset_output;
+		$stringencoding = (empty($langs) ? 'UTF-8' : $langs->charset_output);
 	}

 	$ret = '';