diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-11-14 10:37:47 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-11-14 11:01:42 +0100 |
| commit | 5a5d46b1b873e99d4f3a7ea2973ba45e7fccd711 (patch) | |
| tree | 2a48353279a1a782de7a3fbd2eddd57b3805f24c /apps | |
| parent | fef51895c2689275805bc166bc3f5be95a836b35 (diff) | |
| download | nextcloud-server-5a5d46b1b873e99d4f3a7ea2973ba45e7fccd711.tar.gz nextcloud-server-5a5d46b1b873e99d4f3a7ea2973ba45e7fccd711.zip | |
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')
| -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 36b3a39ab17..70d01088be2 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)); } |