[Pkg-owncloud-commits] [owncloud] 10/273: fix fallback config for default home storage

[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 1374ba9adf3234222826beb1e069acdd34ab5126
Author: Jörn Friedrich Dreyer <jfd at butonic.de>
Date:   Wed Jun 11 14:39:27 2014 +0200

    fix fallback config for default home storage
---
 lib/private/files/filesystem.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index f1f076a..5fb345c 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -326,14 +326,16 @@ class Filesystem {
 
 		if (!is_null($userObject)) {
 			$homeStorage = \OC_Config::getValue( 'home_storage', array(
+				//default home storage configuration:
 				'class' => '\OC\Files\Storage\Home',
 				'arguments' => array()
 			));
-			if (empty($config['class'])) {
-				//FIXME log error? or fallback to '\OC\Files\Storage\Home'?
+			// sanity checks
+			if (empty($homeStorage['class'])) {
+				\OCP\Util::writeLog('files', 'No class given for home_storage', \OCP\Util::ERROR);
 			}
-			if (!isset($config['arguments'])) {
-				$config['arguments'] = array();
+			if (!isset($homeStorage['arguments'])) {
+				$homeStorage['arguments'] = array();
 			}
 			$homeStorage['arguments']['user'] = $userObject;
 			// check for legacy home id (<= 5.0.12)

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