diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-11-22 23:43:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-22 23:43:55 +0100 |
| commit | 77c87b1b233879d48ee4cb154e46dbcd2eaae690 (patch) | |
| tree | c577bd9da950d451a4a56b98d94af9b220bc1ea1 | |
| parent | 55c4d3f555ca571721dcd07b95067c6350e9e3eb (diff) | |
| parent | a584406947e4f343cd7fad81306007bc0e66e5b8 (diff) | |
| download | nextcloud-server-77c87b1b233879d48ee4cb154e46dbcd2eaae690.tar.gz nextcloud-server-77c87b1b233879d48ee4cb154e46dbcd2eaae690.zip | |
Merge pull request #12596 from nextcloud/backport/12448/stable14
[stable14] Load apps that have a dav type set before the dav server plugins
| -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 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)); } |