From be1f319511b3faaf4552ec68a6697b4dda1f5c6c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 2 Jun 2015 12:33:51 +0200
Subject: [PATCH] Correctly ignore remote shares aswell
---
lib/private/encryption/util.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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();
--
GitLab