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

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

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

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