[Pkg-owncloud-commits] [owncloud] 34/104: fix fallback overwriting result of getHome

[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 9960596f4ec9a10ab134178e89191a065a23d81f
Author: Robin Appelman <icewind at owncloud.com>
Date:   Thu Dec 12 12:57:25 2013 +0100

    fix fallback overwriting result of getHome
---
 lib/private/user/user.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index a9e32b5..b4f33fa 100644
--- a/lib/private/user/user.php
+++ b/lib/private/user/user.php
@@ -141,8 +141,9 @@ class User {
 		if (!$this->home) {
 			if ($this->backend->implementsActions(\OC_USER_BACKEND_GET_HOME) and $home = $this->backend->getHome($this->uid)) {
 				$this->home = $home;
+			} else {
+				$this->home = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data") . '/' . $this->uid; //TODO switch to Config object once implemented
 			}
-			$this->home = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data") . '/' . $this->uid; //TODO switch to Config object once implemented
 		}
 		return $this->home;
 	}

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