lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX Temporary dir for mail files must be cleaned at beginning of form

Browse Source
This commit is contained in:
Laurent Destailleur 2018-02-27 10:59:26 +01:00
parent 0cc84ab92f
commit 7d3162313e
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/class/html.formmail.class.php
View File

@ -252,6 +252,14 @@ class FormMail extends Form
$langs->load("other"); $langs->load("other");
$langs->load("mails"); $langs->load("mails");
// Clear temp files. Must be done at beginning, before call of triggers
if (GETPOST('mode','alpha') == 'init' || (GETPOST('modelmailselected','alpha') && GETPOST('modelmailselected','alpha') != '-1'))
{
$this->clear_attached_files();
}
// Call hook getFormMail
$hookmanager->initHooks(array('formmail')); $hookmanager->initHooks(array('formmail'));
$parameters=array( $parameters=array(
@ -306,7 +314,6 @@ class FormMail extends Form
if (GETPOST('mode','alpha') == 'init' || (GETPOST('modelmailselected','alpha') && GETPOST('modelmailselected','alpha') != '-1')) if (GETPOST('mode','alpha') == 'init' || (GETPOST('modelmailselected','alpha') && GETPOST('modelmailselected','alpha') != '-1'))
{ {
$this->clear_attached_files();
if (! empty($arraydefaultmessage['joinfiles']) && is_array($this->param['fileinit'])) if (! empty($arraydefaultmessage['joinfiles']) && is_array($this->param['fileinit']))
{ {
foreach($this->param['fileinit'] as $file) foreach($this->param['fileinit'] as $file)