Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0

This commit is contained in:
ldestailleur 2025-08-24 22:10:12 +02:00
commit a21e896dbe

View file

@ -331,7 +331,7 @@ class CMailFile
// This converts an embed 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');