diff options
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Encryption/DecryptAll.php | 6 | ||||
| -rw-r--r-- | lib/private/Files/Storage/Wrapper/Quota.php | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/Encryption/DecryptAll.php b/lib/private/Encryption/DecryptAll.php index 12bda54a52e..16eee347334 100644 --- a/lib/private/Encryption/DecryptAll.php +++ b/lib/private/Encryption/DecryptAll.php @@ -252,6 +252,12 @@ class DecryptAll { */ protected function decryptFile($path) { + // skip already decrypted files + $fileInfo = $this->rootView->getFileInfo($path); + if ($fileInfo !== false && !$fileInfo->isEncrypted()) { + return true; + } + $source = $path; $target = $path . '.decrypted.' . $this->getTimestamp(); diff --git a/lib/private/Files/Storage/Wrapper/Quota.php b/lib/private/Files/Storage/Wrapper/Quota.php index 860fce57277..4cbe9189593 100644 --- a/lib/private/Files/Storage/Wrapper/Quota.php +++ b/lib/private/Files/Storage/Wrapper/Quota.php @@ -83,7 +83,7 @@ class Quota extends Wrapper { * @return int */ public function free_space($path) { - if ($this->quota < 0 || strpos($path, 'cache') === 0) { + if ($this->quota < 0 || strpos($path, 'cache') === 0 || strpos($path, 'uploads') === 0) { return $this->storage->free_space($path); } else { $used = $this->getSize($this->sizeRoot); |