summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRobin McCorkell <rmccorkell@karoshi.org.uk>2014-05-21 22:29:16 +0100
committerRobin McCorkell <rmccorkell@karoshi.org.uk>2014-05-21 22:29:16 +0100
commitda03ef25d99bcc756c69923e347521340487f798 (patch)
tree218dbc710f2ee6d28042e953a6e37445d62c9a7f /apps
parent0a8a3199158a7a52c071054df4b4d740c90db5ac (diff)
downloadnextcloud-server-da03ef25d99bcc756c69923e347521340487f798.tar.gz
nextcloud-server-da03ef25d99bcc756c69923e347521340487f798.zip
Add priority overriding comments
Diffstat (limited to 'apps')
-rwxr-xr-xapps/files_external/lib/config.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index d47a2b4547b..c69cac874cb 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -145,6 +145,7 @@ class OC_Mount_Config {
$options['priority'] = $backends[$options['class']]['priority'];
}
+ // Override if priority greater
if ( (!isset($mountPoints[$mountPoint]))
|| ($options['priority'] >= $mountPoints[$mountPoint]['priority']) ) {
$options['priority_type'] = self::MOUNT_TYPE_GLOBAL;
@@ -165,6 +166,7 @@ class OC_Mount_Config {
$options['priority'] = $backends[$options['class']]['priority'];
}
+ // Override if priority greater
if ( (!isset($mountPoints[$mountPoint]))
|| ($options['priority'] >= $mountPoints[$mountPoint]['priority']) ) {
$options['priority_type'] = self::MOUNT_TYPE_GLOBAL;
@@ -186,6 +188,7 @@ class OC_Mount_Config {
$options['priority'] = $backends[$options['class']]['priority'];
}
+ // Override if priority greater or if priority type different
if ( (!isset($mountPoints[$mountPoint]))
|| ($options['priority'] >= $mountPoints[$mountPoint]['priority'])
|| ($mountPoints[$mountPoint]['priority_type'] !== self::MOUNT_TYPE_GROUP) ) {
@@ -210,6 +213,7 @@ class OC_Mount_Config {
$options['priority'] = $backends[$options['class']]['priority'];
}
+ // Override if priority greater or if priority type different
if ( (!isset($mountPoints[$mountPoint]))
|| ($options['priority'] >= $mountPoints[$mountPoint]['priority'])
|| ($mountPoints[$mountPoint]['priority_type'] !== self::MOUNT_TYPE_USER) ) {