From 43f50ee7b878162fca65493ea22bee414ffff6eb Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 16 Dec 2024 10:26:32 +0100 Subject: [PATCH] FIX broken feature, entity can not be empty ! --- htdocs/core/lib/files.lib.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index e8e347e7647..ca4268f76c1 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -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)) {