diff options
| author | FlorinPeter <github@florin-peter.de> | 2013-04-29 17:05:41 -0700 |
|---|---|---|
| committer | FlorinPeter <github@florin-peter.de> | 2013-04-29 17:05:41 -0700 |
| commit | b4649701423c2e75373a5ecf7640c6e2b781a970 (patch) | |
| tree | 36366b41b1d22b3ae0f8ccb405833c062dcd4ee2 | |
| parent | 5764bf088eb25f7b635e48cebbffce7addec463a (diff) | |
| parent | f55aaad858396484d35f87ca09e5f53e9848ddf6 (diff) | |
| download | nextcloud-server-b4649701423c2e75373a5ecf7640c6e2b781a970.tar.gz nextcloud-server-b4649701423c2e75373a5ecf7640c6e2b781a970.zip | |
Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache
fix for infinite loop causing on files_encryption branch when testing
| -rw-r--r-- | lib/files/cache/cache.php | 2 | ||||
| -rw-r--r-- | 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 857fe980be6..47f3c272b13 100644 --- a/lib/files/cache/cache.php +++ b/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); 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)) { |