Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache

fix for infinite loop causing on files_encryption branch when testing

lib/files/cache/cache.php

@@ -430,7 +430,7 @@ class Cache {
 		$this->calculateFolderSize($path);
 		if ($path !== '') {
 			$parent = dirname($path);
-			if ($parent === '.') {
+			if ($parent === '.' or $parent === '/') {
 				$parent = '';
 			}
 			$this->correctFolderSize($parent);

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