Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0

Browse Source 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php
This commit is contained in:
Laurent Destailleur
2020-09-12 04:29:28 +02:00
parent ec13d3811e 709542e27d
commit 5ea3f09e17
18 changed files with 119 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/class/CMailFile.class.php
View File

@@ -511,6 +511,9 @@ class CMailFile
{
//$this->message->attach(Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]));
$attachment = Swift_Attachment::fromPath($filename_list[$i], $mimetype_list[$i]);
if (!empty($mimefilename_list[$i])) {
$attachment->setFilename($mimefilename_list[$i]);
}
$this->message->attach($attachment);
}
}