diff options
author | Florin Peter <fp@datawerk.de> | 2013-04-29 15:43:48 +0200 |
---|---|---|
committer | Florin Peter <fp@datawerk.de> | 2013-04-29 15:43:48 +0200 |
commit | f55aaad858396484d35f87ca09e5f53e9848ddf6 (patch) | |
tree | 0efcc17aefe3fe58c28cf3fbfb807d93fa3828b4 /lib | |
parent | a5c72f1ad27dad9b9b81e9819b6e72473a72e80d (diff) | |
download | nextcloud-server-f55aaad858396484d35f87ca09e5f53e9848ddf6.tar.gz nextcloud-server-f55aaad858396484d35f87ca09e5f53e9848ddf6.zip |
fix for infinite loop causing on files_encryption branch when testing "apps/files_encryption/test/crypt.php" on Method testSymmetricStreamEncryptShortFileContent
Diffstat (limited to 'lib')
-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)) { |