diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-06-01 12:00:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-01 12:00:56 +0200 |
| commit | c3fc789b2cad0b065647421a85b7d1d04fca03aa (patch) | |
| tree | 4c0da7230cf6505e6b2caab417fc724121d16e79 /apps/dav/appinfo | |
| parent | d3fceb9b83dc3f826b91d9ebcad9bbb74153e072 (diff) | |
| parent | 367ca563b429e9a93326f960e14863fe05ecec35 (diff) | |
| download | nextcloud-server-c3fc789b2cad0b065647421a85b7d1d04fca03aa.tar.gz nextcloud-server-c3fc789b2cad0b065647421a85b7d1d04fca03aa.zip | |
Merge pull request #9550 from nextcloud/bugfix/noid/override_freebusy_sharing_rules
allow admins to disable FreeBusy without modifying ShareAPI capabilities
Diffstat (limited to 'apps/dav/appinfo')
| -rw-r--r-- | apps/dav/appinfo/v1/caldav.php | 1 | ||||
| -rw-r--r-- | apps/dav/appinfo/v1/carddav.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/apps/dav/appinfo/v1/caldav.php b/apps/dav/appinfo/v1/caldav.php index b4907ce94cb..ecc4fbb8b60 100644 --- a/apps/dav/appinfo/v1/caldav.php +++ b/apps/dav/appinfo/v1/caldav.php @@ -46,6 +46,7 @@ $principalBackend = new Principal( \OC::$server->getGroupManager(), \OC::$server->getShareManager(), \OC::$server->getUserSession(), + \OC::$server->getConfig(), 'principals/' ); $db = \OC::$server->getDatabaseConnection(); diff --git a/apps/dav/appinfo/v1/carddav.php b/apps/dav/appinfo/v1/carddav.php index eddc7a794ac..e55eee610ef 100644 --- a/apps/dav/appinfo/v1/carddav.php +++ b/apps/dav/appinfo/v1/carddav.php @@ -47,6 +47,7 @@ $principalBackend = new Principal( \OC::$server->getGroupManager(), \OC::$server->getShareManager(), \OC::$server->getUserSession(), + \OC::$server->getConfig(), 'principals/' ); $db = \OC::$server->getDatabaseConnection(); |