diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index e88c2d31d13..dd74ce70a64 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2852,9 +2852,11 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 
 			// Check fuser->rights->modulepart->myobject->read and fuser->rights->modulepart->read
 			$partsofdirinoriginalfile = explode('/', $original_file);
-			$partofdirinoriginalfile = $partsofdirinoriginalfile[0];
-			if ($partofdirinoriginalfile && ($fuser->rights->$modulepart->$partofdirinoriginalfile->{$lire} || $fuser->rights->$modulepart->$partofdirinoriginalfile->{$read})) $accessallowed = 1;
-			if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed = 1;
+			if (!empty($partsofdirinoriginalfile[1])) {	// If original_file is xxx/filename (xxx is a part we will use)
+				$partofdirinoriginalfile = $partsofdirinoriginalfile[0];
+				if ($partofdirinoriginalfile && !empty($fuser->rights->$modulepart->$partofdirinoriginalfile) && ($fuser->rights->$modulepart->$partofdirinoriginalfile->{$lire} || $fuser->rights->$modulepart->$partofdirinoriginalfile->{$read})) $accessallowed = 1;
+			}
+			if (!empty($fuser->rights->$modulepart->{$lire}) || !empty($fuser->rights->$modulepart->{$read})) $accessallowed = 1;
 
 			if (is_array($conf->$modulepart->multidir_output) && !empty($conf->$modulepart->multidir_output[$entity])) {
 				$original_file = $conf->$modulepart->multidir_output[$entity].'/'.$original_file;
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index ae8ea17efb6..05dd9bf3954 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -82,7 +82,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
      *
      * @return void
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     	global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
@@ -95,7 +95,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
      *
      * @return	void
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     	global $conf,$user,$langs,$db;
 		$db->rollback();
@@ -108,7 +108,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
+    protected function setUp(): void
     {
     	global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
@@ -123,7 +123,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
+    protected function tearDown(): void
     {
     	print __METHOD__."\n";
     }