summaryrefslogtreecommitdiffstats
path: root/lib/base.php
diff options
context:
space:
mode:
authorClark Tomlinson <fallen013@gmail.com>2015-04-16 09:34:47 -0400
committerClark Tomlinson <fallen013@gmail.com>2015-04-16 09:34:47 -0400
commit1174ad0681bb82252a26b5ee44d5b2990171932b (patch)
tree77f5d7d2e65e9d5eeedb3f36f0576cb5196ba09e /lib/base.php
parentc7e5e30b86733a22ac0d411e00537b10e0220ddd (diff)
parent959665003b408ed837066307350fb76b83beaa52 (diff)
downloadnextcloud-server-1174ad0681bb82252a26b5ee44d5b2990171932b.tar.gz
nextcloud-server-1174ad0681bb82252a26b5ee44d5b2990171932b.zip
Merge pull request #15445 from owncloud/enc2_migration
add migration script from old encryption to new one
Diffstat (limited to 'lib/base.php')
-rw-r--r--lib/base.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php
index f0c54640b17..80f2736fcf6 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -728,6 +728,7 @@ class OC {
new \OC\Encryption\Util(
new \OC\Files\View(),
\OC::$server->getUserManager(),
+ \OC::$server->getGroupManager(),
\OC::$server->getConfig()),
\OC\Files\Filesystem::getMountManager(),
\OC::$server->getEncryptionManager(),