IBX-6880: Skipped normalizing directories in the normalizePath method

For more details see https://issues.ibexa.co/browse/IBX-6880 and #393
ezsystems · Dec 22, 2023 · 4abba92 · 4abba92
1 parent acd0712
commit 4abba92
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/eZ/Publish/Core/IO/FilePathNormalizer/Flysystem.php b/eZ/Publish/Core/IO/FilePathNormalizer/Flysystem.php
@@ -35,8 +35,9 @@ 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 = Util::normalizePath($fileName);
 
-        return Util::normalizePath($filePath);
+        return $filePath . $normalizedFileName;
     }
 }