summaryrefslogtreecommitdiffstats
path: root/lib/private/server.php
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2015-07-20 12:28:36 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2015-07-27 14:59:49 +0200
commitd276aebf4099acd54dff7e727e25d28debf441b8 (patch)
treef0a68cbf002d4e2891853950cb725bff7219d4c9 /lib/private/server.php
parent88fb389eab368a9822e808eeffc23c4e1d2544e4 (diff)
downloadnextcloud-server-d276aebf4099acd54dff7e727e25d28debf441b8.tar.gz
nextcloud-server-d276aebf4099acd54dff7e727e25d28debf441b8.zip
Pass config dir as parameter to detection class
In order to properly test the mimetype function: * constructor takes path to configdir * Added unit tests for mimetype (only if vfsStream is available)
Diffstat (limited to 'lib/private/server.php')
-rw-r--r--lib/private/server.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/server.php b/lib/private/server.php
index 82b2d6765dc..12981fe7f19 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -445,7 +445,9 @@ class Server extends SimpleContainer implements IServerContainer {
return new \OC\Files\Mount\Manager();
});
$this->registerService('MimeTypeDetector', function(Server $c) {
- return new \OC\Files\Type\Detection($c->getURLGenerator());
+ return new \OC\Files\Type\Detection(
+ $c->getURLGenerator(),
+ \OC::$configDir);
});
}