diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-11-29 22:02:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-29 22:02:23 +0100 |
| commit | 331f3b2652c39cde05a8cdd774c5a290a0aac8bc (patch) | |
| tree | ff280f37298a3aeb8cb0103895a9f214fcf66484 /lib/private | |
| parent | a915594b03757a9e7f3f0a266dd29003ac6dd7d0 (diff) | |
| parent | df32b7a40e794a9fc388e033d7d9cf26362d5132 (diff) | |
| download | nextcloud-server-331f3b2652c39cde05a8cdd774c5a290a0aac8bc.tar.gz nextcloud-server-331f3b2652c39cde05a8cdd774c5a290a0aac8bc.zip | |
Merge pull request #12691 from nextcloud/storage-no-encryption-interface
Add interface to allow storages from opting out of encryption
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Encryption/EncryptionWrapper.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php index d0f3ae79d48..c4650d39ee3 100644 --- a/lib/private/Encryption/EncryptionWrapper.php +++ b/lib/private/Encryption/EncryptionWrapper.php @@ -82,9 +82,7 @@ class EncryptionWrapper { 'mount' => $mount ]; - if (!$storage->instanceOfStorage('OCA\Files_Sharing\SharedStorage') - && !$storage->instanceOfStorage('OCA\Files_Sharing\External\Storage') - && !$storage->instanceOfStorage('OC\Files\Storage\OwnCloud')) { + if (!$storage->instanceOfStorage(Storage\IDisableEncryptionStorage::class)) { $user = \OC::$server->getUserSession()->getUser(); $mountManager = Filesystem::getMountManager(); |