mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12448 from nextcloud/bugfix/noid/dav-loadapps 

Load apps that have a dav type set before the dav server plugins
This commit is contained in:
Morris Jobke 2018-11-14 21:42:47 +01:00 committed by GitHub
parent 299c280fb9 5a5d46b1b8
commit c993b6e261
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/appinfo/app.php
View File

@ -27,6 +27,8 @@ use OCA\DAV\AppInfo\Application;
use OCA\DAV\CardDAV\CardDavBackend; use OCA\DAV\CardDAV\CardDavBackend;
use Symfony\Component\EventDispatcher\GenericEvent; use Symfony\Component\EventDispatcher\GenericEvent;
\OC_App::loadApps(['dav']);
$app = new Application(); $app = new Application();
$app->registerHooks(); $app->registerHooks();

3
apps/dav/lib/AppInfo/PluginManager.php
View File

@ -103,9 +103,6 @@ class PluginManager {
if (!isset($info['types']) || !in_array('dav', $info['types'], true)) { if (!isset($info['types']) || !in_array('dav', $info['types'], true)) {
continue; continue;
} }
// FIXME: switch to public API once available
// load app to make sure its classes are available
\OC_App::loadApp($app);
$this->loadSabrePluginsFromInfoXml($this->extractPluginList($info)); $this->loadSabrePluginsFromInfoXml($this->extractPluginList($info));
$this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info)); $this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info));
} }