From: Julius Härtl <jus@bitgrid.net>
Date: Wed, 14 Nov 2018 09:37:47 +0000 (+0100)
Subject: Load apps that have a dav type set before the dav server plugins
X-Git-Tag: v14.0.5RC1~87^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F12596%2Fhead;p=nextcloud-server.git

Load apps that have a dav type set before the dav server plugins

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---

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));
 		}