diff options
Diffstat (limited to 'apps/files_external/lib/config.php')
| -rwxr-xr-x | apps/files_external/lib/config.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 788a136c387..d47a2b4547b 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -769,6 +769,13 @@ class OC_Mount_Config { $mountPath = key($mountPoint[$applicable]); if (isset($data[$mountType])) { if (isset($data[$mountType][$applicable])) { + // Merge priorities + if (isset($data[$mountType][$applicable][$mountPath]) + && isset($data[$mountType][$applicable][$mountPath]['priority']) + && !isset($mountPoint[$applicable][$mountPath]['priority'])) { + $mountPoint[$applicable][$mountPath]['priority'] + = $data[$mountType][$applicable][$mountPath]['priority']; + } $data[$mountType][$applicable] = array_merge($data[$mountType][$applicable], $mountPoint[$applicable]); } else { |