sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Preserve priority if already set

remotes/origin/ldap_group_count
Robin McCorkell 2014-04-03 14:57:35 +07:00
parent 9151d72507
commit e4d3ee7866
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/files_external/lib/config.php
Unescape Escape View File

@ -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 {