diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-11-14 21:42:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-14 21:42:47 +0100 |
| commit | c993b6e261592485cc4f1c7695f067875bf971b3 (patch) | |
| tree | 9f2ce1bd0ede14f4e3e8c21afbfb549b75eea0fd /apps/dav | |
| parent | 299c280fb931f3ff98da30f9fd29213bd52eb106 (diff) | |
| parent | 5a5d46b1b873e99d4f3a7ea2973ba45e7fccd711 (diff) | |
| download | nextcloud-server-c993b6e261592485cc4f1c7695f067875bf971b3.tar.gz nextcloud-server-c993b6e261592485cc4f1c7695f067875bf971b3.zip | |
Merge pull request #12448 from nextcloud/bugfix/noid/dav-loadapps
Load apps that have a dav type set before the dav server plugins
Diffstat (limited to 'apps/dav')
| -rw-r--r-- | apps/dav/appinfo/app.php | 2 | ||||
| -rw-r--r-- | apps/dav/lib/AppInfo/PluginManager.php | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/apps/dav/appinfo/app.php b/apps/dav/appinfo/app.php index 36b3a39ab17..70d01088be2 100644 --- a/apps/dav/appinfo/app.php +++ b/apps/dav/appinfo/app.php @@ -27,6 +27,8 @@ use OCA\DAV\AppInfo\Application; use OCA\DAV\CardDAV\CardDavBackend; use Symfony\Component\EventDispatcher\GenericEvent; +\OC_App::loadApps(['dav']); + $app = new Application(); $app->registerHooks(); diff --git a/apps/dav/lib/AppInfo/PluginManager.php b/apps/dav/lib/AppInfo/PluginManager.php index 59b03f54fd0..a5c397326b2 100644 --- a/apps/dav/lib/AppInfo/PluginManager.php +++ b/apps/dav/lib/AppInfo/PluginManager.php @@ -103,9 +103,6 @@ class PluginManager { if (!isset($info['types']) || !in_array('dav', $info['types'], true)) { 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->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info)); } |