diff options
| author | Daniel Kesselberg <mail@danielkesselberg.de> | 2019-12-08 17:20:50 +0100 |
|---|---|---|
| committer | Daniel Kesselberg <mail@danielkesselberg.de> | 2019-12-09 12:09:43 +0100 |
| commit | 64aba49461114b986952ece89ea9467618a0ab19 (patch) | |
| tree | 7db03718f589f8e610836f3221d5a98cd8c1064c /lib/private/Server.php | |
| parent | 8bc4295cfad1ba65bad3c7c06af1f4a16b9bcba5 (diff) | |
| download | nextcloud-server-64aba49461114b986952ece89ea9467618a0ab19.tar.gz nextcloud-server-64aba49461114b986952ece89ea9467618a0ab19.zip | |
Ensure that we don't merge broken json.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to 'lib/private/Server.php')
| -rw-r--r-- | lib/private/Server.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php index d16b55ac215..dcac72369e4 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -882,6 +882,7 @@ class Server extends ServerContainer implements IServerContainer { $this->registerService(\OCP\Files\IMimeTypeDetector::class, function (Server $c) { return new \OC\Files\Type\Detection( $c->getURLGenerator(), + $c->getLogger(), \OC::$configDir, \OC::$SERVERROOT . '/resources/config/' ); |