Preserve priority if already set

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 5e5340e910f2ed0adf56b20e96f7597f91587a77..223b91788cbb053ed49eda94f06a4528ff559182 100755 (executable)
--- 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 {