mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Scanner must normalize new children names for cache diff 

Since new children from the storage might contain NFD entries, these
must be normalized to NFC to be properly diff'ed with the cache
contents which is always NFC.

This fixes an issue where NFD entries would disappear from the cache
after rescannng for children.
This commit is contained in:
Vincent Petry 2016-05-03 16:41:54 +02:00
parent db4c7fe743
commit f8b2b95408
No known key found for this signature in database
GPG Key ID: AF8F9EFC56562186
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Files/Cache/Scanner.php
View File

@ -341,7 +341,7 @@ class Scanner extends BasicEmitter implements IScanner {
if (is_resource($dh)) { if (is_resource($dh)) {
while (($file = readdir($dh)) !== false) { while (($file = readdir($dh)) !== false) {
if (!Filesystem::isIgnoredDir($file)) { if (!Filesystem::isIgnoredDir($file)) {
$children[] = $file; $children[] = trim(\OC\Files\Filesystem::normalizePath($file), '/');
} }
} }
} }