diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-11-14 12:37:47 +0300 |
|---|---|---|
| committer | Backportbot <backportbot-noreply@rullzer.com> | 2018-11-22 19:26:14 +0300 |
| commit | a584406947e4f343cd7fad81306007bc0e66e5b8 (patch) | |
| tree | ea5f2d888e2164c3688976a7f7bd0fde0ee56cc5 /apps/dav | |
| parent | ff59905b12fab64b27211591884414a7241e4e13 (diff) | |
Load apps that have a dav type set before the dav server plugins
Signed-off-by: Julius Härtl <jus@bitgrid.net>
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 089aaeb6c78..ad696c84147 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)); } |