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

Correctly ignore remote shares aswell

Browse source
This commit is contained in:
Joas Schilling 2015-06-02 12:33:51 +02:00
parent 50a31fa8f9
commit be1f319511
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/encryption/util.php
View file

@ -403,7 +403,10 @@ class Util {
'mountPoint' => $mountPoint, 'mountPoint' => $mountPoint,
'mount' => $mount]; 'mount' => $mount];
if (!$storage->instanceOfStorage('OC\Files\Storage\Shared')) { if (!$storage->instanceOfStorage('OC\Files\Storage\Shared')
&& !$storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')
&& !$storage->instanceOfStorage('OC\Files\Storage\OwnCloud')) {
$manager = \OC::$server->getEncryptionManager(); $manager = \OC::$server->getEncryptionManager();
$user = \OC::$server->getUserSession()->getUser(); $user = \OC::$server->getUserSession()->getUser();
$logger = \OC::$server->getLogger(); $logger = \OC::$server->getLogger();