summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2015-07-10 13:37:26 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2015-07-10 15:15:50 +0200
commit8cac236135c4b07983e824c1ff0b9235aa0a0762 (patch)
tree0e0927389fd31c9da37ffaf9b85a9f7ff6a3a31c /lib
parent895d29adf18fcf6a334839aead46bdb4bd9dbbec (diff)
downloadnextcloud-server-8cac236135c4b07983e824c1ff0b9235aa0a0762.tar.gz
nextcloud-server-8cac236135c4b07983e824c1ff0b9235aa0a0762.zip
Move to OC::$configDif
Diffstat (limited to 'lib')
-rw-r--r--lib/private/helper.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/helper.php b/lib/private/helper.php
index 09b319e90c8..8efa0284a11 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -424,12 +424,12 @@ class OC_Helper {
*/
static public function getMimetypeDetector() {
if (!self::$mimetypeDetector) {
- $dist = file_get_contents(OC::$SERVERROOT . '/config/mimetypemapping.dist.json');
+ $dist = file_get_contents(OC::$configDir . '/mimetypemapping.dist.json');
$mimetypemapping = get_object_vars(json_decode($dist));
//Check if need to load custom mappings
- if (file_exists(OC::$SERVERROOT . '/config/mimetypemapping.json')) {
- $custom = file_get_contents(OC::$SERVERROOT . '/config/mimetypemapping.json');
+ if (file_exists(OC::$configDir . '/mimetypemapping.json')) {
+ $custom = file_get_contents(OC::$configDir . '/mimetypemapping.json');
$custom_mapping = get_object_vars(json_decode($custom));
$mimetypemapping = array_merge($mimetypemapping, $custom_mapping);
}