From e3953f684b20c870fa0708747e07a0a10f6dc35a Mon Sep 17 00:00:00 2001 From: HENRY Florian Date: Thu, 14 Aug 2025 19:03:37 +0200 Subject: [PATCH 1/2] fix: with MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS and multicompany image are not find on send mail (#34946) --- htdocs/core/class/CMailFile.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index e1a90982b20..3050bf3cd63 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -270,7 +270,7 @@ class CMailFile // This convert an embedd file with src="/viewimage.php?modulepart... into a cid link // TODO Exclude viewimage used for the read tracker ? $dolibarr_main_data_root_images=$dolibarr_main_data_root; - if ($conf->entity!==1) { + if ((int)$conf->entity!==1) { $dolibarr_main_data_root_images.='/'.$conf->entity.'/'; } $findimg = $this->findHtmlImages($dolibarr_main_data_root_images.'/medias'); From 381c6fbecfaced84e6854416d5edd1ef70d1c08d Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Sun, 24 Aug 2025 22:05:46 +0200 Subject: [PATCH 2/2] Fix CI --- htdocs/core/class/CMailFile.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 3050bf3cd63..8f4e0f420f7 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -270,11 +270,11 @@ class CMailFile // This convert an embedd file with src="/viewimage.php?modulepart... into a cid link // TODO Exclude viewimage used for the read tracker ? $dolibarr_main_data_root_images=$dolibarr_main_data_root; - if ((int)$conf->entity!==1) { + if ((int) $conf->entity !== 1) { $dolibarr_main_data_root_images.='/'.$conf->entity.'/'; } $findimg = $this->findHtmlImages($dolibarr_main_data_root_images.'/medias'); - if ($findimg<0) { + if ($findimg < 0) { dol_syslog("CMailFile::CMailfile: Error on findHtmlImages"); $this->error = 'ErrorInAddAttachementsImageBaseOnMedia'; return;