wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix shared storage namespace in DecryptAll class

Browse source
This commit is contained in:
Vincent Petry 2016-10-05 15:52:56 +02:00 committed by Morris Jobke
parent 246bb9f33d
commit fca8bd44ab
No known key found for this signature in database
GPG key ID: 9CE5ED29E7FCD38A
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/Encryption/DecryptAll.php
View file

@ -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'];

2
tests/lib/Encryption/DecryptAllTest.php
View file

@ -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(