Merge pull request #27521 from libremaster/develop

File not joined : slash is missing in case DOL_DATA_ROOT doesn't end with a slash
This commit is contained in:
Laurent Destailleur 2024-01-15 11:32:52 +01:00 committed by GitHub
commit 085f7c2796
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5810,9 +5810,9 @@ class Facture extends CommonInvoice
$joinFileName = [];
$joinFileMime = [];
if ($arraymessage->joinfiles == 1 && !empty($tmpinvoice->last_main_doc)) {
$joinFile[] = DOL_DATA_ROOT.$tmpinvoice->last_main_doc;
$joinFile[] = DOL_DATA_ROOT.'/'.$tmpinvoice->last_main_doc;
$joinFileName[] = basename($tmpinvoice->last_main_doc);
$joinFileMime[] = dol_mimetype(DOL_DATA_ROOT.$tmpinvoice->last_main_doc);
$joinFileMime[] = dol_mimetype(DOL_DATA_ROOT.'/'.$tmpinvoice->last_main_doc);
}
// Mail Creation