diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-05-03 16:41:54 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-05-20 09:33:59 +0200 |
| commit | f8b2b954084c247d2edd70b56b17238fe7a8024e (patch) | |
| tree | 1fd1aa270a87fac1cbc8821295271ba3af58573b | |
| parent | db4c7fe743d7cd2019612c9acd732ca0ec4467ea (diff) | |
| download | nextcloud-server-f8b2b954084c247d2edd70b56b17238fe7a8024e.tar.gz nextcloud-server-f8b2b954084c247d2edd70b56b17238fe7a8024e.zip | |
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.
| -rw-r--r-- | lib/private/Files/Cache/Scanner.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Files/Cache/Scanner.php b/lib/private/Files/Cache/Scanner.php index 03aca1924b0..3191ba15ed9 100644 --- a/lib/private/Files/Cache/Scanner.php +++ b/lib/private/Files/Cache/Scanner.php @@ -341,7 +341,7 @@ class Scanner extends BasicEmitter implements IScanner { if (is_resource($dh)) { while (($file = readdir($dh)) !== false) { if (!Filesystem::isIgnoredDir($file)) { - $children[] = $file; + $children[] = trim(\OC\Files\Filesystem::normalizePath($file), '/'); } } } |