From f585994c4be02418d34e83aed621859002c9ebcd Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 2 Apr 2015 13:28:36 +0200
Subject: [PATCH] setup mount manager before wrappers

---
 lib/private/files/filesystem.php | 2 +-
 lib/private/util.php             | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index eef7612531..95e630b776 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -349,7 +349,7 @@ class Filesystem {
 		return true;
 	}
 
-	static public function initMounts() {
+	static public function initMountManager() {
 		if (!self::$mounts) {
 			self::$mounts = new Mount\Manager();
 		}
diff --git a/lib/private/util.php b/lib/private/util.php
index 9e70e3ca35..e6dd307fae 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 */