Merged branch '4.5'

ibexa · Dec 22, 2023 · 182651e · 182651e
2 parents ee3aaf7 + 843d709
commit 182651e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/lib/IO/FilePathNormalizer/Flysystem.php b/src/lib/IO/FilePathNormalizer/Flysystem.php
@@ -37,9 +37,10 @@ public function normalizePath(string $filePath, bool $doHash = true): string
             ? (preg_match(self::HASH_PATTERN, $fileName) ? '' : bin2hex(random_bytes(6)) . '-')
             : '';
 
-        $filePath = $directory . \DIRECTORY_SEPARATOR . $hash . $fileName;
+        $filePath = $directory . \DIRECTORY_SEPARATOR . $hash;
+        $normalizedFileName = $this->pathNormalizer->normalizePath($fileName);
 
-        return $this->pathNormalizer->normalizePath($filePath);
+        return $filePath . $normalizedFileName;
     }
 }