Merge pull request #25187 from owncloud/share-app-initorder-stable9

[stable9] Delay files_sharing's registerMountProviders
This commit is contained in:
Vincent Petry 2016-06-20 17:10:30 +02:00 committed by GitHub
commit 3e3c17a577
1 changed files with 3 additions and 2 deletions

View File

@ -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',