[Pkg-owncloud-commits] [owncloud] 117/153: Use default priority of 100 if backend default is not set

David Prévot taffit at moszumanska.debian.org
Tue May 27 03:05:44 UTC 2014


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

taffit pushed a commit to branch master
in repository owncloud.

commit 856c48bc25ed3abb99763a1baa4a97efc41f1d10
Author: Robin McCorkell <rmccorkell at karoshi.org.uk>
Date:   Wed May 21 22:31:18 2014 +0100

    Use default priority of 100 if backend default is not set
---
 apps/files_external/lib/config.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index c69cac8..21f63bf 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -479,8 +479,13 @@ class OC_Mount_Config {
 
 		// Set default priority if none set
 		if (!isset($mountPoints[$mountType][$applicable][$mountPoint]['priority'])) {
-			$mountPoints[$mountType][$applicable][$mountPoint]['priority']
-				= $backends[$class]['priority'];
+			if (isset($backends[$class]['priority'])) {
+				$mountPoints[$mountType][$applicable][$mountPoint]['priority']
+					= $backends[$class]['priority'];
+			} else {
+				$mountPoints[$mountType][$applicable][$mountPoint]['priority']
+					= 100;
+			}
 		}
 
 		self::writeData($isPersonal ? OCP\User::getUser() : NULL, $mountPoints);

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



More information about the Pkg-owncloud-commits mailing list