diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2015-05-18 11:54:51 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2015-05-18 11:54:51 +0200 |
| commit | efa674f10d407ebc94332f461cfdd52ab56185be (patch) | |
| tree | 4d279b3a1db0ced4cfa256d80c3810ea877783aa /lib | |
| parent | 73a3086945b41afa39debd89481c021934dedb67 (diff) | |
| download | nextcloud-server-efa674f10d407ebc94332f461cfdd52ab56185be.tar.gz nextcloud-server-efa674f10d407ebc94332f461cfdd52ab56185be.zip | |
only try to delete file keys if it is a valid path
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/files/storage/wrapper/encryption.php | 8 |
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; |