]> source.dussan.org Git - nextcloud-server.git/commitdiff
Add priority overriding comments
authorRobin McCorkell <rmccorkell@karoshi.org.uk>
Wed, 21 May 2014 21:29:16 +0000 (22:29 +0100)
committerRobin McCorkell <rmccorkell@karoshi.org.uk>
Wed, 21 May 2014 21:29:16 +0000 (22:29 +0100)
apps/files_external/lib/config.php

index d47a2b4547b7c429f921e9adde673ada7dd3e3d3..c69cac874cb7811348630cbee7600423316acf4f 100755 (executable)
@@ -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) ) {