From a584406947e4f343cd7fad81306007bc0e66e5b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Julius=20H=C3=A4rtl?= Date: Wed, 14 Nov 2018 10:37:47 +0100 Subject: [PATCH] Load apps that have a dav type set before the dav server plugins MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/dav/appinfo/app.php | 2 ++ 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)); } -- 2.39.5