From 13577d8d48b30cd3b648a541f54eee455e067d0c Mon Sep 17 00:00:00 2001
From: Nicolas <info@inovea-conseil.com>
Date: Sat, 30 Nov 2019 19:52:06 +0100
Subject: [PATCH] FIX #12473

---
 scripts/emailings/mailing-send.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 0e161a9c9cc..f4d3ab08802 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2013 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2016 Regis Houssin <regis.houssin@inodbox.com>
+ * Copyright (C) 2019 		Nicolas ZABOURI	<info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -90,6 +91,8 @@ if ($resql) {
 			$emailing = new Mailing($db);
 			$emailing->fetch($obj->rowid);
 
+			$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($emailing->id, 2, 0, 1, $emailing, 'mailing');
+
 			$id = $emailing->id;
 			$subject = $emailing->sujet;
 			$message = $emailing->body;
@@ -228,9 +231,25 @@ if ($resql) {
 
 						$substitutionisok = true;
 
+						$arr_file = array();
+						$arr_mime = array();
+						$arr_name = array();
+						$arr_css  = array();
+
+						$listofpaths=dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
+
+						if (count($listofpaths))
+						{
+							foreach($listofpaths as $key => $val)
+							{
+								$arr_file[]=$listofpaths[$key]['fullname'];
+								$arr_mime[]=dol_mimetype($listofpaths[$key]['name']);
+								$arr_name[]=$listofpaths[$key]['name'];
+							}
+						}
 						// Fabrication du mail
 						$trackid = 'emailing-' . $obj->fk_mailing . '-' . $obj->rowid;
-						$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, array(), array(), array(), '', '', 0, $msgishtml, $errorsto, '', $trackid, '', 'emailing');
+						$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css, $trackid, '', 'emailing');
 
 						if ($mail->error) {
 							$res = 0;