summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-12-16 13:33:58 +0100
committerRobin Appelman <icewind@owncloud.com>2014-12-17 14:03:50 +0100
commit95a145f67f037d5b91ecebc33deaefbb4af96a79 (patch)
tree71214adb6ed3fb1a4185d4cd072ddaa7abaf97fd /apps
parent532ba99f1ccc092dc5ddfbc15b70a027bca3e558 (diff)
downloadnextcloud-server-95a145f67f037d5b91ecebc33deaefbb4af96a79.tar.gz
nextcloud-server-95a145f67f037d5b91ecebc33deaefbb4af96a79.zip
Load mount specific options from the mount config
Diffstat (limited to 'apps')
-rw-r--r--apps/files_external/lib/config/configadapter.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/files_external/lib/config/configadapter.php b/apps/files_external/lib/config/configadapter.php
index 6294e27a774..de484a44698 100644
--- a/apps/files_external/lib/config/configadapter.php
+++ b/apps/files_external/lib/config/configadapter.php
@@ -33,10 +33,11 @@ class ConfigAdapter implements IMountProvider {
$objectClass = $options['options']['objectstore']['class'];
$options['options']['objectstore'] = new $objectClass($options['options']['objectstore']);
}
+ $mountOptions = isset($options['mountOptions']) ? $options['mountOptions'] : [];
if (isset($options['personal']) && $options['personal']) {
- $mounts[] = new PersonalMount($options['class'], $mountPoint, $options['options'], $loader);
+ $mounts[] = new PersonalMount($options['class'], $mountPoint, $options['options'], $loader, $mountOptions);
} else {
- $mounts[] = new MountPoint($options['class'], $mountPoint, $options['options'], $loader);
+ $mounts[] = new MountPoint($options['class'], $mountPoint, $options['options'], $loader, $mountOptions);
}
}
return $mounts;