This commit is contained in:
Laurent Destailleur 2019-12-20 17:06:32 +01:00
parent c0ef3b46ad
commit 1288eb54c2

View File

@ -99,17 +99,19 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
$checked=''; $checked='';
//var_dump(GETPOST($file['relativename'])); var_dump($file['relativename']); var_dump($_FILES['userfile']['name']); //var_dump(GETPOST($file['relativename'])); var_dump($file['relativename']); var_dump($_FILES['userfile']['name']);
// If a file was just uploaded, we check to preselect it // If a file was just uploaded, we check to preselect it
foreach($_FILES['userfile']['name'] as $tmpfile) if (is_array($_FILES['userfile']['name'])) {
{ foreach($_FILES['userfile']['name'] as $tmpfile)
if ($file['relativename'] == (GETPOST('savingdocmask', 'alpha') ? dol_sanitizeFileName($object->ref.'-') : '').$tmpfile) {
{ if ($file['relativename'] == (GETPOST('savingdocmask', 'alpha') ? dol_sanitizeFileName($object->ref.'-') : '').$tmpfile)
$checked=' checked'; {
break; $checked=' checked';
} break;
elseif ($file['relativename'] && in_array($file['relativename'], GETPOST('attachfile', 'array'))) { }
$checked=' checked'; elseif ($file['relativename'] && in_array($file['relativename'], GETPOST('attachfile', 'array'))) {
break; $checked=' checked';
} break;
}
}
} }
// If we edit a line already linked, then $filenamelinked is defined to the filename (without path) of linked file // If we edit a line already linked, then $filenamelinked is defined to the filename (without path) of linked file
if (! empty($filenamelinked) && $filenamelinked == $file['relativename']) if (! empty($filenamelinked) && $filenamelinked == $file['relativename'])