diff options
| author | Robin Appelman <icewind@owncloud.com> | 2015-04-02 13:28:36 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2015-04-02 13:28:36 +0200 |
| commit | f585994c4be02418d34e83aed621859002c9ebcd (patch) | |
| tree | f12f2922278d9ca3b805a05d3c1c0486846daff6 /lib/private/util.php | |
| parent | 3cb53b7756155a5e6208fee48da0ecbab8f19815 (diff) | |
| download | nextcloud-server-f585994c4be02418d34e83aed621859002c9ebcd.tar.gz nextcloud-server-f585994c4be02418d34e83aed621859002c9ebcd.zip | |
setup mount manager before wrappers
Diffstat (limited to 'lib/private/util.php')
| -rw-r--r-- | lib/private/util.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index 9e70e3ca35f..e6dd307faea 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -67,7 +67,7 @@ class OC_Util { // mount local file backend as root $configDataDirectory = OC_Config::getValue("datadirectory", OC::$SERVERROOT . "/data"); //first set up the local "root" storage - \OC\Files\Filesystem::initMounts(); + \OC\Files\Filesystem::initMountManager(); if (!self::$rootMounted) { \OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir' => $configDataDirectory), '/'); self::$rootMounted = true; @@ -96,7 +96,7 @@ class OC_Util { $config['class'] = '\OC\Files\ObjectStore\ObjectStoreStorage'; // mount object storage as root - \OC\Files\Filesystem::initMounts(); + \OC\Files\Filesystem::initMountManager(); if (!self::$rootMounted) { \OC\Files\Filesystem::mount($config['class'], $config['arguments'], '/'); self::$rootMounted = true; @@ -133,6 +133,8 @@ class OC_Util { self::$fsSetup = true; } + \OC\Files\Filesystem::initMountManager(); + \OC\Files\Filesystem::addStorageWrapper('mount_options', function ($mountPoint, \OCP\Files\Storage $storage, \OCP\Files\Mount\IMountPoint $mount) { if ($storage->instanceOfStorage('\OC\Files\Storage\Common')) { /** @var \OC\Files\Storage\Common $storage */ |