From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 17 Jun 2016 09:00:09 +0000 (+0200)
Subject: Delay files_sharing's registerMountProviders
X-Git-Tag: v9.1.0RC1~54^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a13caa0ea2f257faac5cabc19c38240418ab8043;p=nextcloud-server.git

Delay files_sharing's registerMountProviders

This moves registerMountProviders until after the sharing backends were
registered. In some situations registerMountProviders will trigger
listeners which might require filesystem access which itself would
mount shares, which itself requires the sharing backends to be
initialized.
---

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 5740574ec4c..c6ae6903eec 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -32,14 +32,14 @@ $l = \OC::$server->getL10N('files_sharing');
 \OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php';
 \OC::$CLASSPATH['OC\Files\Storage\Shared'] = 'files_sharing/lib/sharedstorage.php';
 
-$application = new \OCA\Files_Sharing\AppInfo\Application();
-$application->registerMountProviders();
-
 \OCA\Files_Sharing\Helper::registerHooks();
 
 \OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
 \OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
 
+$application = new \OCA\Files_Sharing\AppInfo\Application();
+$application->registerMountProviders();
+
 $eventDispatcher = \OC::$server->getEventDispatcher();
 $eventDispatcher->addListener(
 	'OCA\Files::loadAdditionalScripts',