Merge pull request #16884 from daraelmin/daraelmin-patch-3

#Fix #16767 v13 unremovable attached file in mailmodel
This commit is contained in:
Laurent Destailleur 2021-03-20 19:51:07 +01:00 committed by GitHub
commit 861a5becf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -382,8 +382,7 @@ class FormMail extends Form
$listofmimes = array();
$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
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')) {
if (!empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit']))
{
foreach ($this->param['fileinit'] as $file)