From e4d3ee786677ff768f41d1adfabd7d558a2c2c0e Mon Sep 17 00:00:00 2001 From: Robin McCorkell Date: Thu, 3 Apr 2014 14:57:35 +0100 Subject: [PATCH] Preserve priority if already set --- apps/files_external/lib/config.php | 5 +++++ 1 file changed, 5 insertions(+) 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 { -- 2.39.5