diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2015-06-02 12:33:51 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2015-06-02 12:33:51 +0200 |
| commit | be1f319511b3faaf4552ec68a6697b4dda1f5c6c (patch) | |
| tree | 7e40145c2ca55c4807ffba5b74a207e64cf99be3 /lib/private/encryption | |
| parent | 50a31fa8f905c3f9483137bc7b1e57cbf950d2c2 (diff) | |
| download | nextcloud-server-be1f319511b3faaf4552ec68a6697b4dda1f5c6c.tar.gz nextcloud-server-be1f319511b3faaf4552ec68a6697b4dda1f5c6c.zip | |
Correctly ignore remote shares aswell
Diffstat (limited to 'lib/private/encryption')
| -rw-r--r-- | lib/private/encryption/util.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/encryption/util.php b/lib/private/encryption/util.php index 16c09cd26b3..80499249561 100644 --- a/lib/private/encryption/util.php +++ b/lib/private/encryption/util.php @@ -403,7 +403,10 @@ class Util { 'mountPoint' => $mountPoint, '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(); $user = \OC::$server->getUserSession()->getUser(); $logger = \OC::$server->getLogger(); |