FIX broken feature, entity can not be empty !
This commit is contained in:
parent
8f7122c707
commit
43f50ee7b8
1 changed files with 2 additions and 8 deletions
|
|
@ -2747,12 +2747,9 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
|
|||
if (empty($modulepart)) {
|
||||
return 'ErrorBadParameter';
|
||||
}
|
||||
// entity can't be empty
|
||||
if (empty($entity)) {
|
||||
if (!isModEnabled('multicompany')) {
|
||||
$entity = 1;
|
||||
} else {
|
||||
$entity = 0;
|
||||
}
|
||||
$entity = $conf->entity;
|
||||
}
|
||||
// Fix modulepart for backward compatibility
|
||||
if ($modulepart == 'facture') {
|
||||
|
|
@ -2803,9 +2800,6 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
|
|||
if (isModEnabled('multicompany') && (empty($entity) || empty($conf->medias->multidir_output[$entity]))) {
|
||||
return array('accessallowed' => 0, 'error' => 'Value entity must be provided');
|
||||
} */
|
||||
if (empty($entity)) {
|
||||
$entity = 1;
|
||||
}
|
||||
$accessallowed = 1;
|
||||
$original_file = (empty($conf->medias->multidir_output[$entity]) ? $conf->medias->dir_output : $conf->medias->multidir_output[$entity]).'/'.$original_file;
|
||||
} elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root)) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue