diff options
| author | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-04-03 14:57:35 +0100 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-05-21 22:17:21 +0100 |
| commit | e4d3ee786677ff768f41d1adfabd7d558a2c2c0e (patch) | |
| tree | c1f57ca1244e24828253964321e0767b0eb68662 | |
| parent | 9151d7250785eb244a8cfe8082877c231876c671 (diff) | |
| download | nextcloud-server-e4d3ee786677ff768f41d1adfabd7d558a2c2c0e.tar.gz nextcloud-server-e4d3ee786677ff768f41d1adfabd7d558a2c2c0e.zip | |
Preserve priority if already set
| -rwxr-xr-x | apps/files_external/lib/config.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 5e5340e910f..223b91788cb 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -756,6 +756,11 @@ class OC_Mount_Config { $applicable = key($mountPoint); if (isset($data[$mountType])) { if (isset($data[$mountType][$applicable])) { + if (isset($mountPoints[$mountType][$applicable][$mountPoint]) + && isset($mountPoints[$mountType][$applicable][$mountPoint]['priority'])) { + $mount[$applicable][$mountPoint]['priority'] + = $mountPoints[$mountType][$applicable][$mountPoint]['priority']; + } $data[$mountType][$applicable] = array_merge($data[$mountType][$applicable], $mountPoint[$applicable]); } else { |