fix lib/private/encryption/util.php call

diff --git a/lib/base.php b/lib/base.php
index 98da75b61a862bde47693183a5ec19e32fbb9e94..5d1e16296c06a8aff9ee590509b9888f97f0b03f 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -704,17 +704,20 @@ class OC {
                $enabled = self::$server->getEncryptionManager()->isEnabled();
                if ($enabled) {
                        \OC\Files\Filesystem::addStorageWrapper('oc_encryption', function ($mountPoint, $storage, \OCP\Files\Mount\IMountPoint $mount) {
-                               if($mount->getOption('encrypt', true)) {
-                                       $parameters = array('storage' => $storage, 'mountPoint' => $mountPoint);
-                                       $manager = \OC::$server->getEncryptionManager();
-                                       $util = new \OC\Encryption\Util(new \OC\Files\View(), \OC::$server->getUserManager());
-                                       $user = \OC::$server->getUserSession()->getUser();
-                                       $logger = \OC::$server->getLogger();
-                                       $uid = $user ? $user->getUID() : null;
-                                       return new \OC\Files\Storage\Wrapper\Encryption($parameters, $manager, $util, $logger, $uid);
-                               } else {
-                                       return $storage;
-                               }
+
+                               $parameters = [
+                                       '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;
+                               return new \OC\Files\Storage\Wrapper\Encryption($parameters, $manager, $util, $logger, $uid);
                        });
                }
 
@@ -730,7 +733,10 @@ class OC {
                        }
                        $updater = new \OC\Encryption\Update(
                                new \OC\Files\View(),
-                               new \OC\Encryption\Util(new \OC\Files\View(), \OC::$server->getUserManager()),
+                               new \OC\Encryption\Util(
+                                       new \OC\Files\View(),
+                                       \OC::$server->getUserManager(),
+                                       \OC::$server->getConfig()),
                                \OC\Files\Filesystem::getMountManager(),
                                \OC::$server->getEncryptionManager(),
                                $uid

diff --git a/lib/private/encryption/util.php b/lib/private/encryption/util.php
index 961e7eceb2d0917f245216ac4be6fbd03ae0b82b..d983c92781c227416086aad90e35e443466fea60 100644 (file)
--- a/lib/private/encryption/util.php
+++ b/lib/private/encryption/util.php
@@ -66,7 +66,10 @@ class Util {
        protected $excludedPaths;
 
        /**
-        * @param \OC\Files\View $view root view
+        *
+        * @param \OC\Files\View $view
+        * @param \OC\User\Manager $userManager
+        * @param IConfig $config
         */
        public function __construct(
                \OC\Files\View $view,

diff --git a/lib/private/server.php b/lib/private/server.php
index 6a2e45aa59de041555ca1923ee6db00dcdbd159c..d9c580c0f0cb11a3c127e4f5e2e0eb74c97f1708 100644 (file)
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -414,7 +414,7 @@ class Server extends SimpleContainer implements IServerContainer {
         */
        function getEncryptionKeyStorage($encryptionModuleId) {
                $view = new \OC\Files\View();
-               $util = new \OC\Encryption\Util($view, \OC::$server->getUserManager());
+               $util = new \OC\Encryption\Util($view, \OC::$server->getUserManager(), \OC::$server->getConfig());
                return $this->query('EncryptionKeyStorageFactory')->get($encryptionModuleId, $view, $util);
        }