From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 1 Apr 2015 15:22:29 +0000 (+0200)
Subject: don't wrap share storages
X-Git-Tag: v8.1.0alpha1~78^2~39
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a74ee674768cec92c85d313a27ea0c2de5aa29c1;p=nextcloud-server.git

don't wrap share storages
---

diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php
index f8ac174479e..484e0f540b2 100644
--- a/lib/private/encryption/manager.php
+++ b/lib/private/encryption/manager.php
@@ -185,16 +185,19 @@ class Manager implements \OCP\Encryption\IManager {
 				'storage' => $storage,
 				'mountPoint' => $mountPoint,
 				'mount' => $mount];
-			$manager = \OC::$server->getEncryptionManager();
-			$util = new \OC\Encryption\Util(
-				new \OC\Files\View(),
-				\OC::$server->getUserManager(),
-				\OC::$server->getConfig());
-			$user = \OC::$server->getUserSession()->getUser();
-			$logger = \OC::$server->getLogger();
-			$uid = $user ? $user->getUID() : null;
-			$fileHelper = \OC::$server->getEncryptionFilesHelper();
-			return new Encryption($parameters, $manager, $util, $logger, $fileHelper, $uid);
-		});
+
+			if (!($storage instanceof \OC\Files\Storage\Shared)) {
+				$manager = \OC::$server->getEncryptionManager();
+				$util = new \OC\Encryption\Util(
+					new \OC\Files\View(), \OC::$server->getUserManager(), \OC::$server->getConfig());
+				$user = \OC::$server->getUserSession()->getUser();
+				$logger = \OC::$server->getLogger();
+				$uid = $user ? $user->getUID() : null;
+				$fileHelper = \OC::$server->getEncryptionFilesHelper();
+				return new Encryption($parameters, $manager, $util, $logger, $fileHelper, $uid);
+			} else {
+				return $storage;
+			}
+		}, 2);
 	}
 }