From: Robin McCorkell <rmccorkell@karoshi.org.uk>
Date: Thu, 3 Apr 2014 13:57:35 +0000 (+0100)
Subject: Preserve priority if already set
X-Git-Tag: v7.0.0alpha2~224^2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e4d3ee786677ff768f41d1adfabd7d558a2c2c0e;p=nextcloud-server.git

Preserve priority if already set
---

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 {