FIX Filenames must not contains non ascii char or we will get non ascii

char into the SMTP header. Conflicts: htdocs/core/class/CMailFile.class.php
Dolibarr · Feb 6, 2020 · e14612f · e14612f
1 parent 1543028
commit e14612f
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
@@ -124,6 +124,13 @@ public function __construct($subject, $to, $from, $msg, $filename_list = array()
 	{
 		global $conf, $dolibarr_main_data_root;
 
+		// Clean values of $mimefilename_list
+		if (is_array($mimefilename_list)) {
+			foreach($mimefilename_list as $key => $val) {
+				$mimefilename_list[$key] = dol_string_unaccent($mimefilename_list[$key]);
+			}
+		}
+
 		$this->sendcontext = $sendcontext;
 
 		if (empty($replyto)) $replyto=$from;