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 089aaeb6c784106e23b883d686b54310b7a6a1c0..ad696c841476195781190cf92c4369c15d9dd9ba 100644 (file)
--- 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 59b03f54fd02ca285ebee9b8008ac7e1302b6ae3..a5c397326b2d642a63644d1ef5bfbf16ea5ee6aa 100644 (file)
--- 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));
                }