summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-06-17 11:00:09 +0200
committerVincent Petry <pvince81@owncloud.com>2016-06-17 11:00:09 +0200
commita13caa0ea2f257faac5cabc19c38240418ab8043 (patch)
tree9fee69094681b842d2bc736de75bb8a13c442a6f /apps
parentd08eee489ffe9b32110b88b4a5128f2f6188d111 (diff)
downloadnextcloud-server-a13caa0ea2f257faac5cabc19c38240418ab8043.tar.gz
nextcloud-server-a13caa0ea2f257faac5cabc19c38240418ab8043.zip
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.
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/appinfo/app.php6
1 files changed, 3 insertions, 3 deletions
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',