diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-10-20 23:48:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-20 23:48:15 +0200 |
| commit | 2799b0a821a434b9db68952b85105f6281e63faa (patch) | |
| tree | 1af301f54116b1137b9331332203966ee1e3c4f4 /lib/private/Encryption | |
| parent | 1dd7072b4183d81d9323a42dfdad025f0bfe53d8 (diff) | |
| parent | fca8bd44ab3f8f694c82e2ba5401593e0e26acdb (diff) | |
| download | nextcloud-server-2799b0a821a434b9db68952b85105f6281e63faa.tar.gz nextcloud-server-2799b0a821a434b9db68952b85105f6281e63faa.zip | |
Merge pull request #1835 from nextcloud/downstream-24948
Move OC\Files\Storage\Shared to the right namespace
Diffstat (limited to 'lib/private/Encryption')
| -rw-r--r-- | lib/private/Encryption/DecryptAll.php | 2 | ||||
| -rw-r--r-- | lib/private/Encryption/EncryptionWrapper.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Encryption/DecryptAll.php b/lib/private/Encryption/DecryptAll.php index b84395b9e17..caf4237ab9c 100644 --- a/lib/private/Encryption/DecryptAll.php +++ b/lib/private/Encryption/DecryptAll.php @@ -211,7 +211,7 @@ class DecryptAll { $content = $this->rootView->getDirectoryContent($root); foreach ($content as $file) { // only decrypt files owned by the user - if($file->getStorage()->instanceOfStorage('OC\Files\Storage\Shared')) { + if($file->getStorage()->instanceOfStorage('OCA\Files_Sharing\SharedStorage')) { continue; } $path = $root . '/' . $file['name']; diff --git a/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php index 233390f8739..573fe0159ea 100644 --- a/lib/private/Encryption/EncryptionWrapper.php +++ b/lib/private/Encryption/EncryptionWrapper.php @@ -81,7 +81,7 @@ class EncryptionWrapper { 'mount' => $mount ]; - if (!$storage->instanceOfStorage('OC\Files\Storage\Shared') + if (!$storage->instanceOfStorage('OCA\Files_Sharing\SharedStorage') && !$storage->instanceOfStorage('OCA\Files_Sharing\External\Storage') && !$storage->instanceOfStorage('OC\Files\Storage\OwnCloud')) { |