diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-11-23 08:35:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-23 08:35:52 +0100 |
| commit | 122ecf8ebd85760dc691fdc6e0162a465ea9c47f (patch) | |
| tree | 805350665dd13f31e962d7ce8eb3a79303707cc7 | |
| parent | 8e7900c15dbfa6d3c2c484104b5d080bfa284589 (diff) | |
| parent | 59c379bc5e0c369bed908e8dc8cd2d2a8d3bba9d (diff) | |
| download | nextcloud-server-122ecf8ebd85760dc691fdc6e0162a465ea9c47f.tar.gz nextcloud-server-122ecf8ebd85760dc691fdc6e0162a465ea9c47f.zip | |
Merge pull request #12595 from nextcloud/backport/12448/stable13
[stable13] 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 4f4fbe6e126..fad247e53ba 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)); } |