From d3df80a078c5c6f4cface5eb53b980fd13e272ae Mon Sep 17 00:00:00 2001 From: Florin Peter Date: Mon, 6 May 2013 21:14:59 +0200 Subject: [PATCH] merge my fix from master b4649701423c2e75373a5ecf7640c6e2b781a970 --- lib/files/cache/cache.php | 2 +- lib/files/cache/scanner.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php index 4e32ff2ba8a..d0c871bead0 100644 --- 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 f019d4fc608..5241acec1ee 100644 --- 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)) { -- 2.39.5