diff options
author | Vincent Petry <pvince81@owncloud.com> | 2016-10-05 15:52:56 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2016-10-20 20:36:50 +0200 |
commit | fca8bd44ab3f8f694c82e2ba5401593e0e26acdb (patch) | |
tree | 333fed54db5a2dcc7b7fe40211ca33bf9f84c584 | |
parent | 246bb9f33d23340d821384b25097066f65c5d483 (diff) | |
download | nextcloud-server-fca8bd44ab3f8f694c82e2ba5401593e0e26acdb.tar.gz nextcloud-server-fca8bd44ab3f8f694c82e2ba5401593e0e26acdb.zip |
Fix shared storage namespace in DecryptAll class
-rw-r--r-- | lib/private/Encryption/DecryptAll.php | 2 | ||||
-rw-r--r-- | tests/lib/Encryption/DecryptAllTest.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/tests/lib/Encryption/DecryptAllTest.php b/tests/lib/Encryption/DecryptAllTest.php index 7859a65ff6d..289e7de27ab 100644 --- a/tests/lib/Encryption/DecryptAllTest.php +++ b/tests/lib/Encryption/DecryptAllTest.php @@ -260,7 +260,7 @@ class DecryptAllTest extends TestCase { ->disableOriginalConstructor()->getMock(); $sharedStorage->expects($this->once())->method('instanceOfStorage') - ->with('OC\Files\Storage\Shared')->willReturn(true); + ->with('OCA\Files_Sharing\SharedStorage')->willReturn(true); $this->view->expects($this->at(0))->method('getDirectoryContent') ->with('/user1/files')->willReturn( |