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/files_trashbin | |
| 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/files_trashbin')
| -rw-r--r-- | apps/files_trashbin/lib/AppInfo/Application.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files_trashbin/lib/AppInfo/Application.php b/apps/files_trashbin/lib/AppInfo/Application.php index ea27c8c16ea..8e4ec255567 100644 --- a/apps/files_trashbin/lib/AppInfo/Application.php +++ b/apps/files_trashbin/lib/AppInfo/Application.php @@ -57,7 +57,8 @@ class Application extends App { \OC::$server->getUserManager(), \OC::$server->getGroupManager(), \OC::$server->getShareManager(), - \OC::$server->getUserSession() + \OC::$server->getUserSession(), + \OC::$server->getConfig() ); }); } |