summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-06-20 17:10:30 +0200
committerGitHub <noreply@github.com>2016-06-20 17:10:30 +0200
commit3e3c17a577d0fdf052c74b3d306c17f4d3f2d9df (patch)
tree957f44103a9d65d7e85f9517304b2f29360cf52d
parent0129437cd50a5099d27efe4a16cc9e93fc36b4f6 (diff)
parent2f61c2963c6c777e402adf7424e08d4029b25d1d (diff)
downloadnextcloud-server-3e3c17a577d0fdf052c74b3d306c17f4d3f2d9df.tar.gz
nextcloud-server-3e3c17a577d0fdf052c74b3d306c17f4d3f2d9df.zip
Merge pull request #25187 from owncloud/share-app-initorder-stable9
[stable9] Delay files_sharing's registerMountProviders
-rw-r--r--apps/files_sharing/appinfo/app.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 29202c15b22..628921c3248 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -41,8 +41,6 @@ $l = \OC::$server->getL10N('files_sharing');
\OC::$CLASSPATH['OCA\Files\Share\Maintainer'] = 'files_sharing/lib/maintainer.php';
\OC::$CLASSPATH['OCA\Files\Share\Proxy'] = 'files_sharing/lib/proxy.php';
-$application = new Application();
-$application->registerMountProviders();
\OCP\App::registerAdmin('files_sharing', 'settings-admin');
\OCP\App::registerPersonal('files_sharing', 'settings-personal');
@@ -52,6 +50,9 @@ $application->registerMountProviders();
\OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
\OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
+$application = new Application();
+$application->registerMountProviders();
+
$eventDispatcher = \OC::$server->getEventDispatcher();
$eventDispatcher->addListener(
'OCA\Files::loadAdditionalScripts',