summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files/storage/wrapper/encryption.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index f7759d91497..df46a422e6f 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -245,8 +245,12 @@ class Encryption extends Wrapper {
*/
public function rmdir($path) {
$result = $this->storage->rmdir($path);
- if ($result && $this->encryptionManager->isEnabled()) {
- $this->keyStorage->deleteAllFileKeys($this->getFullPath($path));
+ $fullPath = $this->getFullPath($path);
+ if ($result &&
+ $this->util->isExcluded($fullPath) === false &&
+ $this->encryptionManager->isEnabled()
+ ) {
+ $this->keyStorage->deleteAllFileKeys($fullPath);
}
return $result;