[Pkg-owncloud-commits] [owncloud] 111/153: Preserve priority if already set

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit e4d3ee786677ff768f41d1adfabd7d558a2c2c0e
Author: Robin McCorkell <rmccorkell at karoshi.org.uk>
Date:   Thu Apr 3 14:57:35 2014 +0100

    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 5e5340e..223b917 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 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git