upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-07-05 07:48:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Normalize file name before existence check in scanner

Browse source 
The scanner would not find a NFD-encoded file name in an
existing file list that is normalized.

This normalizes the file name before scanning.

Fixes issues where scanning repeatedly would make NFD files flicker in
and out of existence in the file cache.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
This commit is contained in:
Vincent Petry 2021-11-09 11:56:10 +01:00 committed by backportbot[bot]
parent d9e25f5f32
commit 106950d493
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/private/Files/Cache/Scanner.php
View file

@ -420,6 +420,7 @@ class Scanner extends BasicEmitter implements IScanner {
continue;
}
$file = $fileMeta['name'];
$file = trim(\OC\Files\Filesystem::normalizePath($file), '/');
$newChildNames[] = $file;
$child = $path ? $path . '/' . $file : $file;
try {