Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from Nov 14, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/dav/appinfo/app.php
View file
Open in desktop
Expand Up @@ -27,6 +27,8 @@
use OCA\DAV\CardDAV\CardDavBackend;
use Symfony\Component\EventDispatcher\GenericEvent;

\OC_App::loadApps(['dav']);

$app = new Application();
$app->registerHooks();

Expand Down
3 changes: 0 additions & 3 deletions apps/dav/lib/AppInfo/PluginManager.php
View file
Open in desktop
Expand Up @@ -103,9 +103,6 @@ private function populate() {
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));
}
Expand Down