[Pkg-owncloud-commits] [owncloud] 253/457: Correctly ignore remote shares aswell

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit be1f319511b3faaf4552ec68a6697b4dda1f5c6c
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Tue Jun 2 12:33:51 2015 +0200

    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 16c09cd..8049924 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();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git