Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX broken feature, entity can not be empty !

Browse Source
This commit is contained in:
Regis Houssin
2024-12-16 10:26:32 +01:00
parent 8f7122c707
commit 43f50ee7b8
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/lib/files.lib.php
View File

@@ -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)) {