merge my fix from master b4649701423c2e75373a5ecf7640c6e2b781a970

diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 4e32ff2ba8a374a29f2c065e948c82501b7a115c..d0c871bead0d301672bb560c114054cd34efa68c 100644 (file)
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -441,7 +441,7 @@ class Cache {
                $this->calculateFolderSize($path);
                if ($path !== '') {
                        $parent = dirname($path);
-                       if ($parent === '.') {
+                       if ($parent === '.' or $parent === '/') {
                                $parent = '';
                        }
                        $this->correctFolderSize($parent);

diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index f019d4fc608b34588ffbd9d4c5b093a9b5d3f70d..5241acec1ee6b6b3c34c0196f3b98362a9020cec 100644 (file)
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -68,7 +68,7 @@ class Scanner {
                        if ($data) {
                                if ($file) {
                                        $parent = dirname($file);
-                                       if ($parent === '.') {
+                                       if ($parent === '.' or $parent === '/') {
                                                $parent = '';
                                        }
                                        if (!$this->cache->inCache($parent)) {