Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
This commit is contained in:
commit
6aa929cbf8
@ -325,7 +325,7 @@ class FormMail extends Form
|
|||||||
$langs->loadLangs(array('other', 'mails'));
|
$langs->loadLangs(array('other', 'mails'));
|
||||||
|
|
||||||
// Clear temp files. Must be done at beginning, before call of triggers
|
// Clear temp files. Must be done at beginning, before call of triggers
|
||||||
if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1'))
|
if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1'))
|
||||||
{
|
{
|
||||||
$this->clear_attached_files();
|
$this->clear_attached_files();
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user