mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add priority overriding comments

This commit is contained in:
Robin McCorkell 2014-05-21 22:29:16 +01:00
parent 0a8a319915
commit da03ef25d9
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_external/lib/config.php
View File

@ -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) ) {