From: Florin Peter <github@florin-peter.de>
Date: Mon, 6 May 2013 19:14:59 +0000 (+0200)
Subject: merge my fix from master b4649701423c2e75373a5ecf7640c6e2b781a970
X-Git-Tag: v6.0.0alpha2~743^2~118
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d3df80a078c5c6f4cface5eb53b980fd13e272ae;p=nextcloud-server.git

merge my fix from master b4649701423c2e75373a5ecf7640c6e2b781a970
---

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)) {