From da03ef25d99bcc756c69923e347521340487f798 Mon Sep 17 00:00:00 2001 From: Robin McCorkell Date: Wed, 21 May 2014 22:29:16 +0100 Subject: [PATCH] Add priority overriding comments --- apps/files_external/lib/config.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index d47a2b4547..c69cac874c 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) ) {