2
0
forked from Wavyzz/dolibarr

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0

This commit is contained in:
Laurent Destailleur
2023-12-30 13:10:42 +01:00

View File

@@ -213,7 +213,7 @@ class CMailFileTest extends PHPUnit\Framework\TestCase
/** /**
* testCMailFileHTMLWithImage * testCMailFileHTMLWithImage
* *
* @return int * @return int
*/ */
public function testCMailFileHTMLWithImage() public function testCMailFileHTMLWithImage()
{ {
@@ -223,6 +223,7 @@ class CMailFileTest extends PHPUnit\Framework\TestCase
$user = $this->savuser; $user = $this->savuser;
$langs = $this->savlangs; $langs = $this->savlangs;
$db = $this->savdb; $db = $this->savdb;
$conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS = 1; $conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS = 1;
$conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA = 1; $conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA = 1;